From c6ee946678f7121ea6923284e0355345ebc2620f Mon Sep 17 00:00:00 2001 From: newbluemoon 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 " 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 -}