diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2021-04-23 08:42:56 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2021-04-23 23:25:24 -0500 |
| commit | eefc8078bffcb519348128a333e22f92345b017e (patch) | |
| tree | 7598af906755a3bf2e9bbc7d89bd9fe915c6d137 /multimedia/QMPlay2/patches | |
| parent | 6ce7a76ff9a0aa50ce2f30492b92c2d0014c6596 (diff) | |
multimedia/QMPlay2: Updated for version 21.03.09.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'multimedia/QMPlay2/patches')
| -rw-r--r-- | multimedia/QMPlay2/patches/7b2df68ba9bdec45271d9791a4b997f7031aef2b.patch | 22 | ||||
| -rw-r--r-- | multimedia/QMPlay2/patches/c0927948a42621e41da0571209b27ff39badf4cc.patch | 32 |
2 files changed, 54 insertions, 0 deletions
diff --git a/multimedia/QMPlay2/patches/7b2df68ba9bdec45271d9791a4b997f7031aef2b.patch b/multimedia/QMPlay2/patches/7b2df68ba9bdec45271d9791a4b997f7031aef2b.patch new file mode 100644 index 000000000000..efe8495825bf --- /dev/null +++ b/multimedia/QMPlay2/patches/7b2df68ba9bdec45271d9791a4b997f7031aef2b.patch @@ -0,0 +1,22 @@ +From 7b2df68ba9bdec45271d9791a4b997f7031aef2b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16@wp.pl> +Date: Tue, 16 Mar 2021 18:02:28 +0100 +Subject: [PATCH] Fix svg icon engine warning after KDE update + +--- + src/gui/Main.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gui/Main.cpp b/src/gui/Main.cpp +index 2ebd731b..284c2c53 100644 +--- a/src/gui/Main.cpp ++++ b/src/gui/Main.cpp +@@ -790,7 +790,7 @@ int main(int argc, char *argv[]) + qmplay2Gui.loadIcons(); + { + const QIcon svgIcon = QIcon(":/QMPlay2.svgz"); +- if (!svgIcon.availableSizes().isEmpty()) ++ if (svgIcon.availableSizes().size() == 1) + QMessageBox::warning(nullptr, QString(), QObject::tr("QtSvg icon engine plugin doesn't exist.\nQMPlay2 will not scale up icons!")); + } + diff --git a/multimedia/QMPlay2/patches/c0927948a42621e41da0571209b27ff39badf4cc.patch b/multimedia/QMPlay2/patches/c0927948a42621e41da0571209b27ff39badf4cc.patch new file mode 100644 index 000000000000..040e835f7194 --- /dev/null +++ b/multimedia/QMPlay2/patches/c0927948a42621e41da0571209b27ff39badf4cc.patch @@ -0,0 +1,32 @@ +From c0927948a42621e41da0571209b27ff39badf4cc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16@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) |