From 7b84f25f61b4c9c3fdcb3348f78c882de9d2d9a9 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Sun, 29 Sep 2024 14:19:46 +0200 Subject: [PATCH 1/2] sonic-visualiser: update to 5.0.1 --- srcpkgs/sonic-visualiser/template | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template index 193b4b18bcae16..b36afcf720b162 100644 --- a/srcpkgs/sonic-visualiser/template +++ b/srcpkgs/sonic-visualiser/template @@ -1,17 +1,18 @@ # Template file for 'sonic-visualiser' pkgname=sonic-visualiser -version=4.5.2 -revision=2 +version=5.0.1 +revision=1 build_style=meson -hostmakedepends="pkg-config capnproto-devel qt5-host-tools" +hostmakedepends="pkg-config capnproto-devel qt6-base qt6-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 - speex-devel sord-devel vamp-plugin-sdk-devel" + liblo-devel liblrdf-devel libmad-devel liboggz-devel libopusenc-devel + libsamplerate-devel opusfile-devel portaudio-devel pulseaudio-devel + qt6-svg-devel rubberband-devel sord-devel speex-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://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=0816e1ba9e3f97af495ece2554186bccad1cf47090ff8a13f1d08322212db487 +checksum=b0a7d9df66dc33387afbc47e7ecb68d8a413869a3e7d2c4ceabacd04d9cf6e14 +LDFLAGS+="-lopusenc" From 77d191c2819fb2fe33045d7c4e153af04d8ff187 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Wed, 25 Dec 2024 10:15:14 +0100 Subject: [PATCH 2/2] common: make pkg-config-wrapper look under lib instead of lib32 cf. #52402, make 32-bit cross builds find qt-host-tools on a 64-bit host .pc files contain lib32 hardcoded, lib is a symlink to the corresponding lib{32,64} anyway, so let the wrapper look under lib --- common/hooks/pre-configure/02-script-wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh index 3d5d6c2ab3b8f3..e2db9e400e9cbd 100644 --- a/common/hooks/pre-configure/02-script-wrapper.sh +++ b/common/hooks/pre-configure/02-script-wrapper.sh @@ -103,7 +103,7 @@ pkgconfig_wrapper() { export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE" export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/usr/lib/pkgconfig:$XBPS_CROSS_BASE/usr/share/pkgconfig\${PKG_CONFIG_PATH:+:\${PKG_CONFIG_PATH}}" export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig\${PKG_CONFIG_LIBDIR:+:\${PKG_CONFIG_LIBDIR}}" -exec /usr/bin/pkg-config "\$@" +exec /usr/bin/pkg-config "\$@" | sed s/lib32/lib/g _EOF chmod 755 ${XBPS_WRAPPERDIR}/${XBPS_CROSS_TRIPLET}-pkg-config if [ -z "$no_generic_pkgconfig_link" ]; then