Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package QMPlay2 for openSUSE:Factory checked
in at 2021-04-01 14:17:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/QMPlay2 (Old)
and /work/SRC/openSUSE:Factory/.QMPlay2.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "QMPlay2"
Thu Apr 1 14:17:19 2021 rev:53 rq:882121 version:21.03.09
Changes:
--------
--- /work/SRC/openSUSE:Factory/QMPlay2/QMPlay2.changes 2021-03-18
22:55:26.215563011 +0100
+++ /work/SRC/openSUSE:Factory/.QMPlay2.new.2401/QMPlay2.changes
2021-04-01 14:18:35.696099865 +0200
@@ -1,0 +2,5 @@
+Tue Mar 29 22:34:12 UTC 2021 - Simon Vogl <simon.v...@gmx.net>
+
+- Added 0001-fix-driver-crash.patch to fix possible AMD/mesa driver crash
+
+-------------------------------------------------------------------
@@ -6 +11 @@
-- Increase _constrains requirements to fix rare compilation issues
+- Increase _constraints requirements to fix rare compilation issues
New:
----
0001-fix-driver-crash.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ QMPlay2.spec ++++++
--- /var/tmp/diff_new_pack.DBKJrW/_old 2021-04-01 14:18:36.260100742 +0200
+++ /var/tmp/diff_new_pack.DBKJrW/_new 2021-04-01 14:18:36.260100742 +0200
@@ -29,6 +29,8 @@
Patch1: 0001-add-opensuse-customizations.patch
# PATCH-FIX-UPSTREAM
Patch2: 0001-fix-kde-startup-warning.patch
+# PATCH-FIX-UPSTREAM
+Patch3: 0001-fix-driver-crash.patch
BuildRequires: cmake >= 3.16
BuildRequires: gcc-c++
BuildRequires: ninja
++++++ 0001-fix-driver-crash.patch ++++++
>From c0927948a42621e41da0571209b27ff39badf4cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spa...@wp.pl>
Date: Sun, 28 Mar 2021 16:19:51 +0200
Subject: [PATCH] VA-API/Vulkan: Treat invalid DRM format modifier as linear
AMD and Mesa 21.0.1 reports invalid DRM modifier instead of linear.
This causes a driver crash when QMPlay2 is trying to play with invalid
image tiling.
---
src/modules/FFmpeg/VAAPIVulkan.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/modules/FFmpeg/VAAPIVulkan.cpp
b/src/modules/FFmpeg/VAAPIVulkan.cpp
index 47ecf7ab..d31dfd66 100644
--- a/src/modules/FFmpeg/VAAPIVulkan.cpp
+++ b/src/modules/FFmpeg/VAAPIVulkan.cpp
@@ -112,8 +112,13 @@ void VAAPIVulkan::map(Frame &frame)
MemoryObject::FdDescriptors
fdDescriptors(vaSurfaceDescr.num_objects);
for (uint32_t i = 0; i < vaSurfaceDescr.num_objects; ++i)
{
- if (i == 0 && vaSurfaceDescr.objects[i].drm_format_modifier !=
0)
- isLinear = false;
+ if (i == 0)
+ {
+ // 0x0000000000000000 - linear, 0x00ffffffffffffff -
invalid
+ const auto drmFmtMod =
vaSurfaceDescr.objects[i].drm_format_modifier;
+ if (drmFmtMod != 0ull && drmFmtMod != 0xffffffffffffffull)
+ isLinear = false;
+ }
fdDescriptors[i].first = vaSurfaceDescr.objects[i].fd;
fdDescriptors[i].second = (vaSurfaceDescr.objects[i].size > 0)
