[PR PATCH] calf: fix cross

[PR PATCH] calf: fix cross

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1207 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages calf-cross
https://github.com/void-linux/void-packages/pull/34807

calf: fix cross
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/34807.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-calf-cross-34807.patch --]
[-- Type: text/x-diff, Size: 1359 bytes --]

From ba35f8bc7ca333473c675d1872c227c9e6dacde2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Jan 2022 12:46:21 +0100
Subject: [PATCH] calf: fix cross

---
 srcpkgs/calf/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template
index 929f40ad902c..cd56434627d7 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,7 @@ esac
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }
+
+pre_install() {
+	vsed -e "s|exec |exec /usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static |" -i src/calfmakerdf
+}

Re: [PR PATCH] [Updated] calf: fix cross

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages calf-cross
https://github.com/void-linux/void-packages/pull/34807

calf: fix cross
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/34807.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-calf-cross-34807.patch --]
[-- Type: text/x-diff, Size: 2319 bytes --]

From 46b908d2b48618aa638bbf5fe64b881300b4761e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Jan 2022 12:46:21 +0100
Subject: [PATCH 1/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
+}

From 8902e07baafcd2582d444d5b4586d9642a7c6b18 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Jan 2022 15:28:02 +0100
Subject: [PATCH 2/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

Re: [PR PATCH] [Updated] calf: fix cross

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages calf-cross
https://github.com/void-linux/void-packages/pull/34807

calf: fix cross
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/34807.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-calf-cross-34807.patch --]
[-- Type: text/x-diff, Size: 2319 bytes --]

From 1982761425da53bda350edf44206095950cc0568 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <michal@vasilek.cz>
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
+}

Re: [PR PATCH] [Merged]: calf: fix cross

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1053 bytes --]

There's a merged pull request on the void-packages repository

calf: fix cross
https://github.com/void-linux/void-packages/pull/34807

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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
-->