aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorMatteo Bernardini <ponce@slackbuilds.org>2021-04-23 08:42:56 +0200
committerRobby Workman <rworkman@slackbuilds.org>2021-04-23 23:25:24 -0500
commiteefc8078bffcb519348128a333e22f92345b017e (patch)
tree7598af906755a3bf2e9bbc7d89bd9fe915c6d137 /multimedia
parent6ce7a76ff9a0aa50ce2f30492b92c2d0014c6596 (diff)
multimedia/QMPlay2: Updated for version 21.03.09.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/QMPlay2/QMPlay2.SlackBuild25
-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, 74 insertions, 11 deletions
diff --git a/multimedia/QMPlay2/QMPlay2.SlackBuild b/multimedia/QMPlay2/QMPlay2.SlackBuild
index bdfdee018dbb1..f4cbdb0b804ba 100644
--- a/multimedia/QMPlay2/QMPlay2.SlackBuild
+++ b/multimedia/QMPlay2/QMPlay2.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=QMPlay2
-VERSION=${VERSION:-18.12.26}
+VERSION=${VERSION:-21.03.09}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -59,9 +59,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-src-$VERSION
+tar xvf $CWD/$PRGNAM-src-$VERSION.tar.?z
+cd $PRGNAM-src-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,17 +69,26 @@ 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 \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \
-DLANGUAGES=All \
- -DUSE_LINK_TIME_OPTIMIZATION=ON \
- -DUSE_JEMALLOC=OFF \
+ -DUSE_LINK_TIME_OPTIMIZATION=OFF \
+ -DUSE_GLSLC=OFF \
-DUSE_CHIPTUNE_SID=OFF \
- .
+ -DUSE_PCH=ON \
+ -DUSE_GLSLC=OFF \
+ -DUSE_GIT_VERSION=OFF \
+ ..
make
make install DESTDIR=$PKG
+cd ..
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -89,7 +98,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp AUTHORS ChangeLog LICENSE README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp AUTHORS ChangeLog LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/multimedia/QMPlay2/QMPlay2.info b/multimedia/QMPlay2/QMPlay2.info
index 2390d6e98d12f..9d9a7e1bbba0b 100644
--- a/multimedia/QMPlay2/QMPlay2.info
+++ b/multimedia/QMPlay2/QMPlay2.info
@@ -1,8 +1,8 @@
PRGNAM="QMPlay2"
-VERSION="18.12.26"
+VERSION="21.03.09"
HOMEPAGE="https://github.com/zaps166/QMPlay2"
-DOWNLOAD="https://github.com/zaps166/QMPlay2/archive/18.12.26/QMPlay2-18.12.26.tar.gz"
-MD5SUM="d8169c445dec1503b21791b82d9eedd8"
+DOWNLOAD="https://github.com/zaps166/QMPlay2/releases/download/21.03.09/QMPlay2-src-21.03.09.tar.xz"
+MD5SUM="5fe8a2b836c86fcfd5521d3636c579f8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libass libgme"
diff --git a/multimedia/QMPlay2/patches/7b2df68ba9bdec45271d9791a4b997f7031aef2b.patch b/multimedia/QMPlay2/patches/7b2df68ba9bdec45271d9791a4b997f7031aef2b.patch
new file mode 100644
index 0000000000000..efe8495825bf5
--- /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 0000000000000..040e835f7194b
--- /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)