From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] sonic-visualiser: update to 4.0
Date: Sun, 27 Oct 2019 08:06:49 +0100 [thread overview]
Message-ID: <20191027070649.-eiQguRN2Rby2e0_f68eeWE8gLOeMhX84Sa11MzIYcA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-15804@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 338 bytes --]
There is an updated pull request by newbluemoon against master on the void-packages repository
https://github.com/newbluemoon/void-packages sonic-visualiser
https://github.com/void-linux/void-packages/pull/15804
sonic-visualiser: update to 4.0
A patch file from https://github.com/void-linux/void-packages/pull/15804.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sonic-visualiser-15804.patch --]
[-- Type: text/x-diff, Size: 3335 bytes --]
From 50dd11091d406a98bf11a505145ed9267c3e0a47 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 26 Oct 2019 08:12:42 +0200
Subject: [PATCH] sonic-visualiser: update to 4.0
---
srcpkgs/sonic-visualiser/template | 51 +++++++++++++++++++++++++++----
1 file changed, 45 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index 8ad6346646e..30b859e38f9 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,6 +1,6 @@
# Template file for 'sonic-visualiser'
pkgname=sonic-visualiser
-version=3.3
+version=4.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config capnproto-devel"
@@ -13,30 +13,69 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://www.sonicvisualiser.org/"
changelog="https://code.soundsoftware.ac.uk/projects/sonic-visualiser/repository/entry/CHANGELOG"
-distfiles="https://code.soundsoftware.ac.uk/attachments/download/2491/${pkgname}-${version}.tar.gz"
-checksum=18fa86824146c6338057d9a07377fb8068bab4279b1c77c59191b700048c0f93
+distfiles="https://code.soundsoftware.ac.uk/attachments/download/2580/${pkgname}-${version}.tar.gz"
+checksum=355ee125e7b837fdbd008352c96e25b0271ff8234981375266a88bcdf0b43965
+
+case "$XBPS_TARGET_MACHINE" in
+ armv6*) makedepends+=" libatomic-devel" ;;
+esac
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-qmake qt5-svg-devel"
fi
post_extract() {
- # don’t run target-built testing-binaries when cross building
if [ "$CROSS_BUILD" ]; then
+ # don’t run target-built testing-binaries when cross building
sed -i -e '/QMAKE_POST_LINK/d' \
test-svcore-base.pro \
test-svcore-data-fileio.pro \
test-svcore-data-model.pro \
test-svcore-system.pro
+
+ # It’s a mixed build-style: gnu-configure calls qmake:
+ # create the cross-qt.conf file from the qmake build-style
+ # and make qmake use it
+ cat > "${wrksrc}/qt.conf" <<_EOF
+[Paths]
+Sysroot=${XBPS_CROSS_BASE}
+Prefix=${XBPS_CROSS_BASE}/usr
+ArchData=${XBPS_CROSS_BASE}/usr/lib/qt5
+Data=${XBPS_CROSS_BASE}/usr/share/qt5
+Documentation=${XBPS_CROSS_BASE}/usr/share/doc/qt5
+Headers=${XBPS_CROSS_BASE}/usr/include/qt5
+Libraries=${XBPS_CROSS_BASE}/usr/lib
+LibraryExecutables=/usr/lib/qt5/libexec
+Binaries=/usr/lib/qt5/bin
+Tests=${XBPS_CROSS_BASE}/usr/tests
+Plugins=/usr/lib/qt5/plugins
+Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/imports
+Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/qml
+Translations=${XBPS_CROSS_BASE}/usr/share/qt5/translations
+Settings=${XBPS_CROSS_BASE}/etc/xdg
+Examples=${XBPS_CROSS_BASE}/usr/share/qt5/examples
+HostPrefix=/usr
+HostData=/usr/lib/qt5
+HostBinaries=/usr/lib/qt5/bin
+HostLibraries=/usr/lib
+Spec=linux-g++
+TargetSpec=linux-g++
+_EOF
+
+ sed -i -e "s;\(\$QMAKE -r\) \(sonic-visualiser.pro\);\1 -qtconf ${wrksrc}/qt.conf \2;" \
+ configure
fi
+
+ case "$XBPS_TARGET_MACHINE" in
+ armv6*) sed -i -e "s/^linux\*:LIBS +=.*/& -latomic/" config.pri.in ;;
+ esac
}
do_install() {
vbin sonic-visualiser
vbin piper-vamp-simple-server
vbin vamp-plugin-load-checker
- vlicense COPYING
- vlicense deploy/linux/doc/sonic-visualiser/copyright
+ vdoc deploy/linux/doc/sonic-visualiser/copyright
vdoc README.md
vdoc README.OSC
vdoc CITATION
next prev parent reply other threads:[~2019-10-27 7:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-26 6:14 [PR PATCH] " voidlinux-github
2019-10-26 8:31 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-26 8:31 ` voidlinux-github
2019-10-26 8:45 ` voidlinux-github
2019-10-26 8:49 ` voidlinux-github
2019-10-27 6:03 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-27 6:03 ` voidlinux-github
2019-10-27 7:06 ` voidlinux-github [this message]
2019-10-27 7:06 ` voidlinux-github
2019-10-27 7:44 ` voidlinux-github
2019-10-29 15:09 ` voidlinux-github
2019-10-29 20:16 ` [PR PATCH] [Merged]: " voidlinux-github
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=20191027070649.-eiQguRN2Rby2e0_f68eeWE8gLOeMhX84Sa11MzIYcA@z \
--to=voidlinux-github@inbox.vuxu.org \
--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).