[PR PATCH] ardour: update to 6.5.0

[PR PATCH] ardour: update to 6.5.0

[tibequadorian]

[-- 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
 

Re: [PR REVIEW] ardour: update to 6.5.0

[ericonr]

[-- 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.

Re: [PR REVIEW] ardour: update to 6.5.0

[tibequadorian]

[-- 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.

Re: [PR REVIEW] ardour: update to 6.5.0

[tibequadorian]

[-- 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...

Re: [PR PATCH] [Updated] ardour: update to 6.5.0

[tibequadorian]

[-- 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
 

Re: [PR REVIEW] ardour: update to 6.5.0

[tibequadorian]

[-- 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.

Re: [PR REVIEW] ardour: update to 6.5.0

[ericonr]

[-- 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.

Re: [PR REVIEW] ardour: update to 6.5.0

[tibequadorian]

[-- 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

Re: [PR REVIEW] ardour: update to 6.5.0

[ericonr]

[-- 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 :)

Re: [PR REVIEW] ardour: update to 6.5.0

[tibequadorian]

[-- 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

Re: ardour: update to 6.5.0

[ericonr]

[-- 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

Re: [PR PATCH] [Merged]: ardour: update to 6.5.0

[ericonr]

[-- 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
-->

[PR PATCH] ardour: update to 6.5.0

[tibequadorian]

[-- Attachment #1: Type: text/plain, Size: 387 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/27474

ardour: update to 6.5.0
Also fix ARM build; It was using host x86 flags

Taken from #26615

A patch file from https://github.com/void-linux/void-packages/pull/27474.patch is attached

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

From 60e0e007c4465551e453466c3d777f4f4b6713c8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 27 Dec 2020 16:58:19 +0100
Subject: [PATCH] ardour: update to 6.5.0

Also fix ARM build; It was using host x86 flags
---
 srcpkgs/ardour/patches/arm.patch | 27 +++++++++++++++++++++++++++
 srcpkgs/ardour/template          | 14 ++++----------
 2 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/ardour/patches/arm.patch

diff --git a/srcpkgs/ardour/patches/arm.patch b/srcpkgs/ardour/patches/arm.patch
new file mode 100644
index 00000000000..a3bf5714c57
--- /dev/null
+++ b/srcpkgs/ardour/patches/arm.patch
@@ -0,0 +1,27 @@
+From d36a90d99a9dfbe64cfc6c888d0e2c508a2e751d Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Sun, 22 Nov 2020 17:33:42 -0600
+Subject: [PATCH] arm* build fix
+
+config script detects host CPU and enables x86 flags
+which are incompatible with ARM*
+---
+ wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git wscript wscript
+index 3bc26a3..bb0dc1c 100644
+--- wscript
++++ wscript
+@@ -531,7 +531,7 @@ int main() { return 0; }''',
+             # determine processor flags via /proc/cpuinfo
+             #
+ 
+-            if conf.env['build_target'] != 'i386':
++            if conf.env['build_target'] != 'i386' and conf.env['build_target'] != 'arm':
+ 
+                 flag_line = os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1]
+                 x86_flags = flag_line.split (": ")[1:][0].split ()
+-- 
+2.29.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index fcedeb358a1..2691d070093 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
@@ -18,7 +18,7 @@ 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,14 +26,8 @@ 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" ;;
-	*)        broken="Don't know build target" ;;
+	arm*)     configure_args+=" --dist-target=arm";;
+	*)        ;; #broken="Don't know build target" ;;
 esac
 
 post_install() {