* [PR PATCH] ardour: update to 6.5.0
@ 2021-02-17 16:34 tibequadorian
2021-02-17 16:43 ` [PR REVIEW] " ericonr
` (10 more replies)
0 siblings, 11 replies; 14+ messages in thread
From: tibequadorian @ 2021-02-17 16:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1653 bytes --]
There is a new pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ardour
https://github.com/void-linux/void-packages/pull/28818
ardour: update to 6.5.0
fix ARMv7 build. **(needs testing)**
closes #26615
<!-- 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
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/28818.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ardour-28818.patch --]
[-- Type: text/x-diff, Size: 3003 bytes --]
From 93c187a73925a5046ddc87a90bfa5a4111659a91 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 15:19:02 +0100
Subject: [PATCH] ardour: update to 6.5.0
fix ARMv7 build
---
.../patches/fix-musl-platform-detection.patch | 13 +++++++++++++
srcpkgs/ardour/template | 13 ++++---------
2 files changed, 17 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/ardour/patches/fix-musl-platform-detection.patch
diff --git a/srcpkgs/ardour/patches/fix-musl-platform-detection.patch b/srcpkgs/ardour/patches/fix-musl-platform-detection.patch
new file mode 100644
index 00000000000..8f2d29cc423
--- /dev/null
+++ b/srcpkgs/ardour/patches/fix-musl-platform-detection.patch
@@ -0,0 +1,13 @@
+On musl libc only __linux__ is defined
+
+--- libs/vst3/pluginterfaces/base/fplatform.h
++++ libs/vst3/pluginterfaces/base/fplatform.h
+@@ -86,7 +86,7 @@
+ //-----------------------------------------------------------------------------
+ // LINUX
+ //-----------------------------------------------------------------------------
+-#elif __gnu_linux__
++#elif __linux__
+ #define SMTG_OS_LINUX 1
+ #define SMTG_OS_MACOS 0
+ #define SMTG_OS_WINDOWS 0
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index fcedeb358a1..cfc1817c318 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=6.3.0
+version=6.5.0
revision=1
wrksrc="Ardour-${version}"
build_style=waf3
@@ -13,12 +13,13 @@ makedepends="boost-devel liblrdf-devel liblo-devel lilv-devel suil-devel
vamp-plugin-sdk-devel fftw-devel jack-devel libsamplerate-devel lv2
sratom-devel gtkmm2-devel libarchive-devel fluidsynth-devel hidapi-devel
libltc-devel glibmm-devel"
+depends="desktop-file-utils"
short_desc="Professional-grade digital audio workstation"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://ardour.org"
distfiles="https://community.ardour.org/src/Ardour-${version}.tar.bz2"
-checksum=93418636d7d93f66bdf479ed5bf3c6b0cc0198dc8f76c5555110d3147e4ec74b
+checksum=ac981ec7565fa8a171116bc2fbeb3198a01aad4b7d7c846f965e074a8a162bdb
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
@@ -26,13 +27,7 @@ case "$XBPS_TARGET_MACHINE" in
aarch64*) configure_args+=" --dist-target=aarch64" ;;
ppc64*) configure_args+=" --dist-target=ppc64" ;;
ppc*) configure_args+=" --dist-target=ppc" ;;
- # Seriously, build system for arm is broken
- # They don't use cflags from pkg-config
- # We need to append output of
- # pkg-config --cflags glibmm-2.4 libxml-2.0
- # into both CFLAGS and CXXFLAGS, and it's still run into failure.
- # Maybe better with NEON on, I don't know
- arm*) broken="You are compiling libardour on a platform for which ardour/cycles.h needs work" ;;
+ armv7*) configure_args+=" --dist-target=armhf" ;;
*) broken="Don't know build target" ;;
esac
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] ardour: update to 6.5.0
2021-02-17 16:34 [PR PATCH] ardour: update to 6.5.0 tibequadorian
@ 2021-02-17 16:43 ` ericonr
2021-02-17 17:00 ` tibequadorian
` (9 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2021-02-17 16:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28818#discussion_r577769127
Comment:
Did you try armv6l as well? Our target is pretty much armhf.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] ardour: update to 6.5.0
2021-02-17 16:34 [PR PATCH] ardour: update to 6.5.0 tibequadorian
2021-02-17 16:43 ` [PR REVIEW] " ericonr
@ 2021-02-17 17:00 ` tibequadorian
2021-02-17 17:06 ` tibequadorian
` (8 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: tibequadorian @ 2021-02-17 17:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 361 bytes --]
New review comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/28818#discussion_r577782875
Comment:
I think they used armhf for Armv7 CPU with Thumb-2 and VFP3D16 like Debian does (https://wiki.debian.org/ArmHardFloatPort/) because it's used to enable NEON instructions, which ARMv6 and lower do not support.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] ardour: update to 6.5.0
2021-02-17 16:34 [PR PATCH] ardour: update to 6.5.0 tibequadorian
2021-02-17 16:43 ` [PR REVIEW] " ericonr
2021-02-17 17:00 ` tibequadorian
@ 2021-02-17 17:06 ` tibequadorian
2021-02-17 17:08 ` [PR PATCH] [Updated] " tibequadorian
` (7 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: tibequadorian @ 2021-02-17 17:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New review comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/28818#discussion_r577787219
Comment:
I'll try if it builds but can't test it...
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] ardour: update to 6.5.0
2021-02-17 16:34 [PR PATCH] ardour: update to 6.5.0 tibequadorian
` (2 preceding siblings ...)
2021-02-17 17:06 ` tibequadorian
@ 2021-02-17 17:08 ` tibequadorian
2021-02-17 17:15 ` [PR REVIEW] " tibequadorian
` (6 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: tibequadorian @ 2021-02-17 17:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1658 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages ardour
https://github.com/void-linux/void-packages/pull/28818
ardour: update to 6.5.0
fix ARMv7 build. **(needs testing)**
closes #26615
<!-- 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
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/28818.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ardour-28818.patch --]
[-- Type: text/x-diff, Size: 3001 bytes --]
From baf8c4323f510e87621b887836af72edfd7fd528 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 15:19:02 +0100
Subject: [PATCH] ardour: update to 6.5.0
fix ARM build
---
.../patches/fix-musl-platform-detection.patch | 13 +++++++++++++
srcpkgs/ardour/template | 13 ++++---------
2 files changed, 17 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/ardour/patches/fix-musl-platform-detection.patch
diff --git a/srcpkgs/ardour/patches/fix-musl-platform-detection.patch b/srcpkgs/ardour/patches/fix-musl-platform-detection.patch
new file mode 100644
index 00000000000..8f2d29cc423
--- /dev/null
+++ b/srcpkgs/ardour/patches/fix-musl-platform-detection.patch
@@ -0,0 +1,13 @@
+On musl libc only __linux__ is defined
+
+--- libs/vst3/pluginterfaces/base/fplatform.h
++++ libs/vst3/pluginterfaces/base/fplatform.h
+@@ -86,7 +86,7 @@
+ //-----------------------------------------------------------------------------
+ // LINUX
+ //-----------------------------------------------------------------------------
+-#elif __gnu_linux__
++#elif __linux__
+ #define SMTG_OS_LINUX 1
+ #define SMTG_OS_MACOS 0
+ #define SMTG_OS_WINDOWS 0
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index fcedeb358a1..7fb37a36769 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=6.3.0
+version=6.5.0
revision=1
wrksrc="Ardour-${version}"
build_style=waf3
@@ -13,12 +13,13 @@ makedepends="boost-devel liblrdf-devel liblo-devel lilv-devel suil-devel
vamp-plugin-sdk-devel fftw-devel jack-devel libsamplerate-devel lv2
sratom-devel gtkmm2-devel libarchive-devel fluidsynth-devel hidapi-devel
libltc-devel glibmm-devel"
+depends="desktop-file-utils"
short_desc="Professional-grade digital audio workstation"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://ardour.org"
distfiles="https://community.ardour.org/src/Ardour-${version}.tar.bz2"
-checksum=93418636d7d93f66bdf479ed5bf3c6b0cc0198dc8f76c5555110d3147e4ec74b
+checksum=ac981ec7565fa8a171116bc2fbeb3198a01aad4b7d7c846f965e074a8a162bdb
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
@@ -26,13 +27,7 @@ case "$XBPS_TARGET_MACHINE" in
aarch64*) configure_args+=" --dist-target=aarch64" ;;
ppc64*) configure_args+=" --dist-target=ppc64" ;;
ppc*) configure_args+=" --dist-target=ppc" ;;
- # Seriously, build system for arm is broken
- # They don't use cflags from pkg-config
- # We need to append output of
- # pkg-config --cflags glibmm-2.4 libxml-2.0
- # into both CFLAGS and CXXFLAGS, and it's still run into failure.
- # Maybe better with NEON on, I don't know
- arm*) broken="You are compiling libardour on a platform for which ardour/cycles.h needs work" ;;
+ arm*) configure_args+=" --dist-target=armhf" ;;
*) broken="Don't know build target" ;;
esac
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] ardour: update to 6.5.0
2021-02-17 16:34 [PR PATCH] ardour: update to 6.5.0 tibequadorian
` (3 preceding siblings ...)
2021-02-17 17:08 ` [PR PATCH] [Updated] " tibequadorian
@ 2021-02-17 17:15 ` tibequadorian
2021-02-17 17:20 ` ericonr
` (5 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: tibequadorian @ 2021-02-17 17:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 361 bytes --]
New review comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/28818#discussion_r577782875
Comment:
I think they used armhf for Armv7 CPU with Thumb-2 and VFP3D16 like Debian does (https://wiki.debian.org/ArmHardFloatPort/) because it's used to enable NEON instructions, which ARMv6 and lower do not support.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] ardour: update to 6.5.0
2021-02-17 16:34 [PR PATCH] ardour: update to 6.5.0 tibequadorian
` (4 preceding siblings ...)
2021-02-17 17:15 ` [PR REVIEW] " tibequadorian
@ 2021-02-17 17:20 ` ericonr
2021-02-17 17:54 ` tibequadorian
` (4 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2021-02-17 17:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28818#discussion_r577797569
Comment:
If it has a headless version I can test locally.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] ardour: update to 6.5.0
2021-02-17 16:34 [PR PATCH] ardour: update to 6.5.0 tibequadorian
` (5 preceding siblings ...)
2021-02-17 17:20 ` ericonr
@ 2021-02-17 17:54 ` tibequadorian
2021-02-17 18:42 ` ericonr
` (3 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: tibequadorian @ 2021-02-17 17:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New review comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/28818#discussion_r577821911
Comment:
seems to work
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] ardour: update to 6.5.0
2021-02-17 16:34 [PR PATCH] ardour: update to 6.5.0 tibequadorian
` (6 preceding siblings ...)
2021-02-17 17:54 ` tibequadorian
@ 2021-02-17 18:42 ` ericonr
2021-02-17 18:43 ` tibequadorian
` (2 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2021-02-17 18:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28818#discussion_r577838683
Comment:
Please look into upstreaming this, if you can :)
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] ardour: update to 6.5.0
2021-02-17 16:34 [PR PATCH] ardour: update to 6.5.0 tibequadorian
` (7 preceding siblings ...)
2021-02-17 18:42 ` ericonr
@ 2021-02-17 18:43 ` tibequadorian
2021-02-19 6:12 ` ericonr
2021-02-19 6:12 ` [PR PATCH] [Merged]: " ericonr
10 siblings, 0 replies; 14+ messages in thread
From: tibequadorian @ 2021-02-17 18:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New review comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/28818#discussion_r577855139
Comment:
just did ^^ https://github.com/Ardour/ardour/pull/596
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: ardour: update to 6.5.0
2021-02-17 16:34 [PR PATCH] ardour: update to 6.5.0 tibequadorian
` (8 preceding siblings ...)
2021-02-17 18:43 ` tibequadorian
@ 2021-02-19 6:12 ` ericonr
2021-02-19 6:12 ` [PR PATCH] [Merged]: " ericonr
10 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2021-02-19 6:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28818#issuecomment-781852648
Comment:
Tested graphically, even :)
Working great on armv6l
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Merged]: ardour: update to 6.5.0
2021-02-17 16:34 [PR PATCH] ardour: update to 6.5.0 tibequadorian
` (9 preceding siblings ...)
2021-02-19 6:12 ` ericonr
@ 2021-02-19 6:12 ` ericonr
10 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2021-02-19 6:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1493 bytes --]
There's a merged pull request on the void-packages repository
ardour: update to 6.5.0
https://github.com/void-linux/void-packages/pull/28818
Description:
fix ARM~v7~ build. **(needs testing)**
closes #26615
<!-- 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
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
-->
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] ardour: update to 6.5.0
2020-11-22 23:41 [PR PATCH] ardour: update to 6.4.0 ndowens
2020-12-27 18:46 ` [PR REVIEW] ardour: update to 6.5.0 ericonr
@ 2020-12-27 18:46 ` ericonr
1 sibling, 0 replies; 14+ messages in thread
From: ericonr @ 2020-12-27 18:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26615#discussion_r549151017
Comment:
imo disable this for all targets
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] ardour: update to 6.5.0
2020-11-22 23:41 [PR PATCH] ardour: update to 6.4.0 ndowens
@ 2020-12-27 18:46 ` ericonr
2020-12-27 18:46 ` ericonr
1 sibling, 0 replies; 14+ messages in thread
From: ericonr @ 2020-12-27 18:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26615#discussion_r549150981
Comment:
indentation is maybe wonky?
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2021-02-19 6:12 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-17 16:34 [PR PATCH] ardour: update to 6.5.0 tibequadorian
2021-02-17 16:43 ` [PR REVIEW] " ericonr
2021-02-17 17:00 ` tibequadorian
2021-02-17 17:06 ` tibequadorian
2021-02-17 17:08 ` [PR PATCH] [Updated] " tibequadorian
2021-02-17 17:15 ` [PR REVIEW] " tibequadorian
2021-02-17 17:20 ` ericonr
2021-02-17 17:54 ` tibequadorian
2021-02-17 18:42 ` ericonr
2021-02-17 18:43 ` tibequadorian
2021-02-19 6:12 ` ericonr
2021-02-19 6:12 ` [PR PATCH] [Merged]: " ericonr
-- strict thread matches above, loose matches on Subject: below --
2020-11-22 23:41 [PR PATCH] ardour: update to 6.4.0 ndowens
2020-12-27 18:46 ` [PR REVIEW] ardour: update to 6.5.0 ericonr
2020-12-27 18:46 ` ericonr
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).