summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdinaldo P. Silva <edps.mundognu@gmail.com>2022-04-26 02:15:03 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-04-30 13:51:49 +0700
commit9d10a084335a626e66d85f6ca94a8d4e58862ea3 (patch)
treebc7a424ff1a0e17d28f52f2f036430b4241fcc5d
parent73ebe61d96dc5851662d8ae42339eb13a0986f91 (diff)
downloadslackbuilds-9d10a084335a626e66d85f6ca94a8d4e58862ea3.tar.gz
multimedia/QMPlay2: Updated for version 22.03.19.
Signed-off-by: Dave Woodfall <dave@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--multimedia/QMPlay2/QMPlay2.SlackBuild6
-rw-r--r--multimedia/QMPlay2/QMPlay2.info6
-rw-r--r--multimedia/QMPlay2/patches/7b2df68ba9bdec45271d9791a4b997f7031aef2b.patch22
-rw-r--r--multimedia/QMPlay2/patches/c0927948a42621e41da0571209b27ff39badf4cc.patch32
4 files changed, 5 insertions, 61 deletions
diff --git a/multimedia/QMPlay2/QMPlay2.SlackBuild b/multimedia/QMPlay2/QMPlay2.SlackBuild
index f3d75526f2..a493774935 100644
--- a/multimedia/QMPlay2/QMPlay2.SlackBuild
+++ b/multimedia/QMPlay2/QMPlay2.SlackBuild
@@ -2,7 +2,7 @@
#
# Slackware build script for QMPlay2.
#
-# Copyright 2017-2019 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2017-2022 Edinaldo P. Silva, Rio de Janeiro, Brazil.
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=QMPlay2
-VERSION=${VERSION:-21.03.09}
+VERSION=${VERSION:-22.03.19}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -79,8 +79,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-for i in $CWD/patches/* ; do patch -p1 < $i ; done
-
mkdir build
cd build
cmake \
diff --git a/multimedia/QMPlay2/QMPlay2.info b/multimedia/QMPlay2/QMPlay2.info
index 9d9a7e1bbb..b1bc3590a3 100644
--- a/multimedia/QMPlay2/QMPlay2.info
+++ b/multimedia/QMPlay2/QMPlay2.info
@@ -1,8 +1,8 @@
PRGNAM="QMPlay2"
-VERSION="21.03.09"
+VERSION="22.03.19"
HOMEPAGE="https://github.com/zaps166/QMPlay2"
-DOWNLOAD="https://github.com/zaps166/QMPlay2/releases/download/21.03.09/QMPlay2-src-21.03.09.tar.xz"
-MD5SUM="5fe8a2b836c86fcfd5521d3636c579f8"
+DOWNLOAD="https://github.com/zaps166/QMPlay2/releases/download/22.03.19/QMPlay2-src-22.03.19.tar.xz"
+MD5SUM="13c642cc196a42457766fd9757854d70"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libass libgme"
diff --git a/multimedia/QMPlay2/patches/7b2df68ba9bdec45271d9791a4b997f7031aef2b.patch b/multimedia/QMPlay2/patches/7b2df68ba9bdec45271d9791a4b997f7031aef2b.patch
deleted file mode 100644
index efe8495825..0000000000
--- a/multimedia/QMPlay2/patches/7b2df68ba9bdec45271d9791a4b997f7031aef2b.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index 040e835f71..0000000000
--- a/multimedia/QMPlay2/patches/c0927948a42621e41da0571209b27ff39badf4cc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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)