From: newbluemoon <newbluemoon@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] sonic-visualiser: update to 4.4
Date: Thu, 30 Sep 2021 07:49:38 +0200 [thread overview]
Message-ID: <20210930054938.sEf_-qTdFHw9vUL2pEAeL_TjB79lxU6nJWMg1-P8d6E@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33051@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1652 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/33051
sonic-visualiser: update to 4.4
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
Tested on x86_64 and x86_64-musl.
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/33051.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sonic-visualiser-33051.patch --]
[-- Type: text/x-diff, Size: 3887 bytes --]
From c6ee946678f7121ea6923284e0355345ebc2620f Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 22 Sep 2021 10:16:38 +0200
Subject: [PATCH] sonic-visualiser: update to 4.4
---
srcpkgs/sonic-visualiser/patches/config.patch | 14 ------
srcpkgs/sonic-visualiser/template | 46 ++++---------------
2 files changed, 9 insertions(+), 51 deletions(-)
delete mode 100644 srcpkgs/sonic-visualiser/patches/config.patch
diff --git a/srcpkgs/sonic-visualiser/patches/config.patch b/srcpkgs/sonic-visualiser/patches/config.patch
deleted file mode 100644
index 024f2f6491c3..000000000000
--- a/srcpkgs/sonic-visualiser/patches/config.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/checker/checker.pri 2017-05-25 10:26:10.000000000 +0200
-+++ b/checker/checker.pri 2017-08-15 10:32:05.033468727 +0200
-@@ -1,3 +1,4 @@
-+include(../config.pri)
-
- CONFIG += qt stl c++11 exceptions console warn_on
- QT -= xml network gui widgets
---- a/checker/helper.pro 2017-05-25 10:26:10.000000000 +0200
-+++ b/checker/helper.pro 2017-08-15 10:32:44.558652327 +0200
-@@ -1,3 +1,4 @@
-+include(../config.pri)
-
- TEMPLATE = app
-
diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index 4daa56060eea..6b091832f666 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,55 +1,27 @@
# Template file for 'sonic-visualiser'
pkgname=sonic-visualiser
-version=4.2
-revision=2
-build_style=gnu-configure
-build_helper=qmake
-hostmakedepends="pkg-config capnproto-devel"
+version=4.4
+revision=1
+build_style=meson
+hostmakedepends="pkg-config capnproto-devel qt5-host-tools"
makedepends="capnproto-devel jack-devel libfishsound-devel libid3tag-devel
liblo-devel liblrdf-devel libmad-devel liboggz-devel libsamplerate-devel
opusfile-devel portaudio-devel pulseaudio-devel qt5-svg-devel rubberband-devel
- sord-devel vamp-plugin-sdk-devel"
+ speex-devel sord-devel vamp-plugin-sdk-devel"
short_desc="Viewing and analysing the contents of music audio files"
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/2755/${pkgname}-${version}.tar.gz"
-checksum=38e91a4035962ad177905a9f1249136fe88d4b596fd9b8f40c82b60dadca5bf3
+changelog="https://raw.githubusercontent.com/sonic-visualiser/sonic-visualiser/default/CHANGELOG"
+distfiles="https://github.com/sonic-visualiser/sonic-visualiser/releases/download/sv_v${version}/sonic-visualiser-${version}.tar.gz"
+checksum=762d95cfceff5f2ba31bb632596f6c822ca5b4ee21f3e3615add20bfc24ae16e
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
fi
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-qmake qt5-svg-devel"
- configure_args+=" ac_cv_prog_QMAKE=${XBPS_WRAPPERDIR}/qmake"
-fi
-
post_extract() {
- 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
- fi
-
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- sed -i -e "s/^linux\*:LIBS +=.*/& -latomic/" config.pri.in
+ vsed -i "s/^general_link_args = \[\]/general_link_args = \['-latomic'\]/" meson.build
fi
}
-
-do_install() {
- vbin sonic-visualiser
- vbin piper-vamp-simple-server
- vbin vamp-plugin-load-checker
- vdoc deploy/linux/doc/sonic-visualiser/copyright
- vdoc README.md
- vdoc README_OSC.md
- vdoc CITATION
- vinstall icons/sv-icon.svg 644 usr/share/pixmaps
- vinstall icons/sv-icon-light.svg 644 usr/share/pixmaps
- vinstall deploy/linux/deb-skeleton/usr/share/applications/sonic-visualiser.desktop 644 usr/share/applications
-}
next prev parent reply other threads:[~2021-09-30 5:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-22 8:40 [PR PATCH] " newbluemoon
2021-09-29 23:06 ` [PR REVIEW] " ericonr
2021-09-29 23:06 ` ericonr
2021-09-29 23:06 ` ericonr
2021-09-30 5:49 ` newbluemoon [this message]
2021-09-30 5:59 ` newbluemoon
2021-10-01 18:42 ` ericonr
2021-10-01 18:42 ` [PR PATCH] [Merged]: " ericonr
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=20210930054938.sEf_-qTdFHw9vUL2pEAeL_TjB79lxU6nJWMg1-P8d6E@z \
--to=newbluemoon@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).