From b6baf783df953fc3b43eaef878fa107394ee9adc Mon Sep 17 00:00:00 2001 From: Andrew Benson 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 5ce9934a44b7c6..00000000000000 --- 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 - - #include -+#ifdef Q_ATOMIC_INT64_IS_SUPPORTED - static QAtomicInteger g_id; -+#else -+static QAtomicInteger 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(g_id[1]) << 32) | g_id[0]; -+#endif - } - - void QMPlay2OSD::clear(bool all) diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template index f69901bc04bc98..fe2aa89773ea17 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"