diff --git a/mesa-22.2.4.tar.xz b/mesa-22.3.0.tar.xz
similarity index 64%
rename from mesa-22.2.4.tar.xz
rename to mesa-22.3.0.tar.xz
index c8c123b34d45adb88d04b1a00fc7d638a4109689..ae1847cb889cca63353a9555a659eb0fe9221366 100644
Binary files a/mesa-22.2.4.tar.xz and b/mesa-22.3.0.tar.xz differ
diff --git a/mesa.spec b/mesa.spec
index 138db2e377105ed4ed6231e245a891da8c8a35b3..01f72a83dbde2e91f00845533870e711a82441bb 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -3,7 +3,7 @@
 %global with_hardware 1
 %global with_vulkan_hw 1
 %global with_vdpau 1
-%global with_vaapi 1
+%global with_va 1
 %global base_vulkan ,amd
 
 %ifarch x86_64
@@ -11,7 +11,7 @@
 %global with_i915   1
 %global with_iris   1
 %global with_xa     1
-%global platform_vulkan ,intel
+%global platform_vulkan ,intel,intel_hasvk
 %endif
 
 %ifarch aarch64
@@ -32,7 +32,7 @@
 
 Name:           mesa
 Summary:        Mesa graphics libraries
-Version:        22.2.4
+Version:        22.3.0
 Release:        %{anolis_release}%{?dist}
 License:        MIT
 URL:            http://www.mesa3d.org
@@ -82,7 +82,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}
@@ -155,6 +155,9 @@ Provides:       libEGL-devel
 %package dri-drivers
 Summary:        Mesa-based DRI drivers
 Requires:       %{name}-filesystem = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?with_va}
+Recommends:	%{name}-va-drivers = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
 
 %description dri-drivers
 %{summary}.
@@ -168,6 +171,17 @@ Requires:       %{name}-filesystem = %{?epoch:%{epoch}:}%{version}-%{release}
 %{summary}.
 %endif
 
+%if 0%{?with_va}
+%package        va-drivers
+Summary:        Mesa-based VA-API video acceleration drivers
+Requires:       %{name}-filesystem = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-vaapi-drivers < 22.2.0-5
+Conflicts:	%{name}-dri-drivers < 22.3.0
+ 
+%description va-drivers
+%{summary}.
+%endif
+
 %if 0%{?with_vdpau}
 %package        vdpau-drivers
 Summary:        Mesa-based VDPAU drivers
@@ -292,9 +306,8 @@ The drivers with support for the Vulkan API.
   -Dgallium-drivers=swrast,virgl \
 %endif
   -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} \
@@ -332,13 +345,6 @@ rm -vf %{buildroot}%{_libdir}/libGLES*
 # determine the vendor
 ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_system.so.0
 
-# this keeps breaking, check it early.  note that the exit from eu-ftr is odd.
-pushd %{buildroot}%{_libdir}
-for i in libOSMesa*.so libGL.so ; do
-    eu-findtextrel $i && exit 1
-done
-popd
-
 %generate_compatibility_deps
 
 %files filesystem
@@ -367,8 +373,8 @@ popd
 
 %files libEGL-devel
 %dir %{_includedir}/EGL
+%{_includedir}/EGL/eglext_angle.h
 %{_includedir}/EGL/eglmesaext.h
-%{_includedir}/EGL/eglextchromium.h
 
 %files libglapi
 %{_libdir}/libglapi.so.0
@@ -521,15 +527,6 @@ popd
 %{_libdir}/dri/vmwgfx_dri.so
 %{abidir}/vmwgfx_dri.dump
 %endif
-%{_libdir}/dri/nouveau_drv_video.so
-%{abidir}/nouveau_drv_video.dump
-%if 0%{?with_r600}
-%{_libdir}/dri/r600_drv_video.so
-%endif
-%if 0%{?with_radeonsi}
-%{_libdir}/dri/radeonsi_drv_video.so
-%{abidir}/radeonsi_drv_video.dump
-%endif
 %endif
 %if 0%{?with_opencl}
 %dir %{_libdir}/gallium-pipe
@@ -576,6 +573,22 @@ popd
 %files omx-drivers
 %{_libdir}/bellagio/libomx_mesa.so
 %endif
+
+%if 0%{?with_va}
+%files va-drivers
+%{_libdir}/dri/nouveau_drv_video.so
+%{abidir}/nouveau_drv_video.dump
+%if 0%{?with_r600}
+%{_libdir}/dri/r600_drv_video.so
+%endif
+%if 0%{?with_radeonsi}
+%{_libdir}/dri/radeonsi_drv_video.so
+%{abidir}/radeonsi_drv_video.dump
+%endif
+%{_libdir}/dri/virtio_gpu_drv_video.so
+%{abidir}/virtio_gpu_drv_video.dump
+%endif
+
 %if 0%{?with_vdpau}
 %files vdpau-drivers
 %{_libdir}/vdpau/libvdpau_nouveau.so.1*
@@ -589,6 +602,7 @@ popd
 %if 0%{?with_radeonsi}
 %{_libdir}/vdpau/libvdpau_radeonsi.so.1*
 %endif
+%{_libdir}/vdpau/libvdpau_virtio_gpu.so.1*
 %endif
 
 %files vulkan-drivers
@@ -607,6 +621,9 @@ popd
 %{_libdir}/libvulkan_intel.so
 %{abidir}/libvulkan_intel.dump
 %{_datadir}/vulkan/icd.d/intel_icd.*.json
+%{_libdir}/libvulkan_intel_hasvk.so
+%{abidir}/libvulkan_intel_hasvk.dump
+%{_datadir}/vulkan/icd.d/intel_hasvk_icd.*.json
 %endif
 %ifarch aarch64
 %{_libdir}/libvulkan_broadcom.so
@@ -622,6 +639,9 @@ popd
 %endif
 
 %changelog
+* Thu Dec 1 2022 Funda Wang <fundawang@yeah.net> - 22.3.0-1
+- New version 22.3.0
+
 * Thu Nov 17 2022 Funda Wang <fundawang@yeah.net> - 22.2.4-1
 - New version 22.2.4