diff --git a/Mesa.changes b/Mesa.changes
index 100e2a3..1ff3b6c 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Sep 29 10:00:03 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
+
+- re-disable video codecs due to possible patent issues
+  https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15258
+
+-------------------------------------------------------------------
+Tue Sep 27 11:08:54 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
+
+- Pass -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec to
+  meson, keep support for hardware codecs inside vaapi, vdpau and
+  vulkan. These were previously enabled automatically.
+- enabled "swrast" and "amd" Vulkan drivers on riscv64, which is
+  upstream default anyway ...
+
 -------------------------------------------------------------------
 Wed Sep 21 14:20:04 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/Mesa.spec b/Mesa.spec
index ddd60d0..5ff0228 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -29,6 +29,11 @@
 %define _lto_cflags %{nil}
 %endif
 
+# Possible patent issues, see
+# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15258
+# for more details
+%define video_codecs 0
+
 %define drivers 0
 
 %define glamor 1
@@ -68,6 +73,10 @@
     %define with_vulkan 1
     %define vulkan_drivers swrast,amd,broadcom,freedreno
   %endif
+  %ifarch riscv64
+    %define with_vulkan 1
+    %define vulkan_drivers swrast,amd
+  %endif
 %endif
 
 %ifarch aarch64 %{arm} ppc64 ppc64le riscv64 s390x %{ix86} x86_64
@@ -813,6 +822,9 @@ egl_platforms=x11,wayland
             -Dshared-llvm=true \
 %endif
 %if "%{flavor}" == "drivers"
+%if %{video_codecs}
+            -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec \
+%endif
 %if %{gallium_loader}
             -Dgallium-vdpau=true \
             -Dgallium-xvmc=true \