From 1982761425da53bda350edf44206095950cc0568 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 2 Jan 2022 15:28:02 +0100 Subject: [PATCH 1/2] fluidsynth: add missing dependencies to -devel --- srcpkgs/fluidsynth/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template index 3718cedaae2b..fa5848aeef8a 100644 --- a/srcpkgs/fluidsynth/template +++ b/srcpkgs/fluidsynth/template @@ -1,7 +1,7 @@ # Template file for 'fluidsynth' pkgname=fluidsynth version=2.2.4 -revision=1 +revision=2 build_style=cmake make_check_target=check configure_args="-DLIB_SUFFIX= @@ -23,7 +23,7 @@ libfluidsynth_package() { } fluidsynth-devel_package() { - depends="libfluidsynth>=${version}" + depends="libfluidsynth>=${version} $makedepends" short_desc+=" - development files" pkg_install() { vmove usr/include From c6462d69eeabddc2e9830acb94eeddd5f2d9c415 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 2 Jan 2022 12:46:21 +0100 Subject: [PATCH 2/2] calf: fix cross --- srcpkgs/calf/template | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template index 929f40ad902c..a7752803b04b 100644 --- a/srcpkgs/calf/template +++ b/srcpkgs/calf/template @@ -3,6 +3,7 @@ pkgname=calf version=0.90.3 revision=3 build_style=gnu-configure +build_helper=qemu configure_args="--enable-experimental" hostmakedepends="automake libtool pkg-config" makedepends="expat-devel dssi-devel jack-devel glib-devel gtk+-devel @@ -16,7 +17,6 @@ homepage="http://calf-studio-gear.org" changelog="https://raw.githubusercontent.com/calf-studio-gear/calf/master/ChangeLog" distfiles="https://github.com/calf-studio-gear/calf/archive/${version}.tar.gz" checksum=8781cbd1a81dec59b5923a23141ab2ca74e0e724389e15ffcf3820ace138a46c -nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/6795/steps/shell_3/logs/stdio" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) configure_args+=" --enable-sse";; @@ -25,3 +25,9 @@ esac pre_configure() { NOCONFIGURE=1 ./autogen.sh } + +pre_install() { + if [ "$CROSS_BUILD" ]; then + vsed -e "s|exec |exec /usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static |" -i src/calfmakerdf + fi +}