From: abenson <abenson@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] QMPlay2: update to 20.05.02.
Date: Thu, 07 May 2020 19:35:23 +0200 [thread overview]
Message-ID: <20200507173523.4b4T4WezuvuhbNhWDmYvRp-nLXMfr-Hfbukoz5LXtoc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-21724@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages QMPlay2_20.05.02
https://github.com/void-linux/void-packages/pull/21724
QMPlay2: update to 20.05.02.
A patch file from https://github.com/void-linux/void-packages/pull/21724.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-QMPlay2_20.05.02-21724.patch --]
[-- Type: text/x-diff, Size: 2267 bytes --]
From b6baf783df953fc3b43eaef878fa107394ee9adc Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 7 May 2020 11:44:17 -0500
Subject: [PATCH] QMPlay2: update to 20.05.02.
---
srcpkgs/QMPlay2/patches/arm-QAtomic64.patch | 24 ---------------------
srcpkgs/QMPlay2/template | 9 ++++++--
2 files changed, 7 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/QMPlay2/patches/arm-QAtomic64.patch
diff --git a/srcpkgs/QMPlay2/patches/arm-QAtomic64.patch b/srcpkgs/QMPlay2/patches/arm-QAtomic64.patch
deleted file mode 100644
index 5ce9934a44b..00000000000
--- a/srcpkgs/QMPlay2/patches/arm-QAtomic64.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/qmplay2/QMPlay2OSD.cpp.orig 2018-10-21 13:35:36.079993098 +0200
-+++ src/qmplay2/QMPlay2OSD.cpp 2018-10-21 13:38:08.398003961 +0200
-@@ -19,11 +19,21 @@
- #include <QMPlay2OSD.hpp>
-
- #include <QAtomicInteger>
-+#ifdef Q_ATOMIC_INT64_IS_SUPPORTED
- static QAtomicInteger<quint64> g_id;
-+#else
-+static QAtomicInteger<quint32> g_id[2];
-+#endif
-
- void QMPlay2OSD::genId()
- {
-+#ifdef Q_ATOMIC_INT64_IS_SUPPORTED
- m_id = ++g_id;
-+#else
-+ if (0 == ++g_id[0])
-+ ++g_id[1];
-+ m_id = (static_cast<quint64>(g_id[1]) << 32) | g_id[0];
-+#endif
- }
-
- void QMPlay2OSD::clear(bool all)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index f69901bc04b..fe2aa89773e 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,6 +1,6 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
-version=19.12.19
+version=20.05.02
revision=1
wrksrc="${pkgname}-src-${version}"
build_style=cmake
@@ -15,7 +15,12 @@ license="LGPL-3.0-only"
homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=ef85bc83e916266f9467d9f7a8a82cc5c150a5a7e807034b195f666973d16b35
+checksum=79380131cc7aa01e7aa6c8c25515bd810635f1b71461fcb72480f2df712a1bda
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+ configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
QMPlay2-devel_package() {
short_desc+=" - development files"
next prev parent reply other threads:[~2020-05-07 17:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-07 16:48 [PR PATCH] " abenson
2020-05-07 17:35 ` abenson [this message]
2020-05-07 19:21 ` [PR PATCH] [Merged]: " abenson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200507173523.4b4T4WezuvuhbNhWDmYvRp-nLXMfr-Hfbukoz5LXtoc@z \
--to=abenson@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).