[PR PATCH] ardour: update to 7.0.

[PR PATCH] ardour: update to 7.0.

[rantlivelintkale]

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

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

https://github.com/rantlivelintkale/void-packages update-ardour
https://github.com/void-linux/void-packages/pull/40054

ardour: update to 7.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl

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

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

From 3100576ffd7d0e218d64a5d203517234c16a570c Mon Sep 17 00:00:00 2001
From: Veikka Valtteri Kallinen <valtteri@kallinen.xyz>
Date: Wed, 19 Oct 2022 16:57:16 +0300
Subject: [PATCH] ardour: update to 7.0.

---
 .../patches/7.0-use-bundled-qm-dsp.patch      | 22 ++++++++
 .../ardour/patches/use-bundled-qm-dsp.patch   | 50 -------------------
 srcpkgs/ardour/template                       |  6 +--
 3 files changed, 25 insertions(+), 53 deletions(-)
 create mode 100644 srcpkgs/ardour/patches/7.0-use-bundled-qm-dsp.patch
 delete mode 100644 srcpkgs/ardour/patches/use-bundled-qm-dsp.patch

diff --git a/srcpkgs/ardour/patches/7.0-use-bundled-qm-dsp.patch b/srcpkgs/ardour/patches/7.0-use-bundled-qm-dsp.patch
new file mode 100644
index 000000000000..0a217840d767
--- /dev/null
+++ b/srcpkgs/ardour/patches/7.0-use-bundled-qm-dsp.patch
@@ -0,0 +1,22 @@
+diff --git i/libs/qm-dsp/wscript w/libs/qm-dsp/wscript
+index a59801bf36..8432c89f0c 100644
+--- i/libs/qm-dsp/wscript
++++ w/libs/qm-dsp/wscript
+@@ -23,6 +23,7 @@ def options(opt):
+     autowaf.set_options(opt)
+ 
+ def configure(conf):
++    return
+     if conf.is_defined('USE_EXTERNAL_LIBS'):
+         conf.check_cxx(header_name="base/Pitch.h", mandatory=True, msg="Checking for qm-dsp headers")
+         conf.check_cxx(lib="qm-dsp", uselib_store="QMDSP", mandatory=True)
+@@ -51,9 +52,6 @@ def configure(conf):
+                            )
+ 
+ def build(bld):
+-    if bld.is_defined('USE_EXTERNAL_LIBS'):
+-        return
+-
+     # Host Library
+     obj = bld(features = 'c cxx cxxstlib')
+     obj.source = '''
diff --git a/srcpkgs/ardour/patches/use-bundled-qm-dsp.patch b/srcpkgs/ardour/patches/use-bundled-qm-dsp.patch
deleted file mode 100644
index 07e6c74963c1..000000000000
--- a/srcpkgs/ardour/patches/use-bundled-qm-dsp.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 2b5e890480691ce5a6c9f05b55e83a3b9ed8a8b9 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 9 Mar 2020 16:33:43 +0100
-Subject: [PATCH] use bundled qm-dsp
-
----
- libs/qm-dsp/wscript | 11 ++---------
- wscript             |  2 --
- 2 files changed, 2 insertions(+), 11 deletions(-)
-
-diff --git libs/qm-dsp/wscript libs/qm-dsp/wscript
-index 92dc9502b1..dbbff16722 100644
---- a/libs/qm-dsp/wscript
-+++ b/libs/qm-dsp/wscript
-@@ -23,17 +23,10 @@ def options(opt):
-     autowaf.set_options(opt)
- 
- def configure(conf):
--    if conf.is_defined('USE_EXTERNAL_LIBS'):
--        conf.check_cxx(header_name="base/Pitch.h", mandatory=True)
--        conf.check_cxx(lib="qm-dsp", uselib_store="QMDSP", mandatory=True)
--    else:
--        conf.load('compiler_cxx')
--        autowaf.configure(conf)
-+    conf.load('compiler_cxx')
-+    autowaf.configure(conf)
- 
- def build(bld):
--    if bld.is_defined('USE_EXTERNAL_LIBS'):
--        return
--
-     # Host Library
-     obj = bld(features = 'c cxx cxxstlib')
-     obj.source = '''
-diff --git wscript wscript
-index 4b5acb0ad7..c0358af37e 100644
---- a/wscript
-+++ b/wscript
-@@ -991,8 +991,6 @@ def configure(conf):
- 
-     if Options.options.use_external_libs:
-         conf.define('USE_EXTERNAL_LIBS', 1)
--        conf.env.append_value(
--            'CXXFLAGS', '-I' + Options.options.qm_dsp_include)
- 
-     if Options.options.boost_include != '':
-         conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include)
--- 
-2.25.1
-
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index 271e43f046ac..ad727707bfde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,7 +1,7 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.9
-revision=2
+version=7.0
+revision=1
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --configdir=/etc
@@ -21,7 +21,7 @@ homepage="http://ardour.org"
 
 CXXFLAGS="-fpermissive"
 PATH="/usr/libexec/chroot-git:$PATH"
-conf_files="/etc/ardour6/*"
+conf_files="/etc/ardour7/*"
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*)  configure_args+=" --dist-target=x86_64" ;;

Re: ardour: update to 7.0.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/40054#issuecomment-1287969756

Comment:
cc: maintainer @tibequadorian 

Re: ardour: update to 7.0.

[rantlivelintkale]

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

New comment by rantlivelintkale on void-packages repository

https://github.com/void-linux/void-packages/pull/40054#issuecomment-1288609029

Comment:
```
2022-10-23T02:14:07.9145074Z [1103/1148] Linking build/gtk2_ardour/ardour-7.0.0
2022-10-23T02:14:08.7255634Z /usr/lib/gcc/arm-linux-musleabihf/10.2.1/../../../../arm-linux-musleabihf/bin/ld: gtk2_ardour/audio_clock.cc.1.o: undefined reference to symbol '__atomic_compare_exchange_8'
2022-10-23T02:14:08.7256544Z /usr/lib/gcc/arm-linux-musleabihf/10.2.1/../../../../arm-linux-musleabihf/bin/ld: /usr/arm-linux-musleabihf/lib/libatomic.so.1: error adding symbols: DSO missing from command line
2022-10-23T02:14:08.7257064Z collect2: error: ld returned 1 exit status
```

I assume that's why the armv6l-musl failed, I'll try building it locally as well.

The lint complains about the `PATH` variable not being prefixed, but I assume that it should not be prefixed since it is the `PATH` variable.

Re: ardour: update to 7.0.

[rantlivelintkale]

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

New comment by rantlivelintkale on void-packages repository

https://github.com/void-linux/void-packages/pull/40054#issuecomment-1296827934

Comment:
> ```
> 2022-10-23T02:14:07.9145074Z [1103/1148] Linking build/gtk2_ardour/ardour-7.0.0
> 2022-10-23T02:14:08.7255634Z /usr/lib/gcc/arm-linux-musleabihf/10.2.1/../../../../arm-linux-musleabihf/bin/ld: gtk2_ardour/audio_clock.cc.1.o: undefined reference to symbol '__atomic_compare_exchange_8'
> 2022-10-23T02:14:08.7256544Z /usr/lib/gcc/arm-linux-musleabihf/10.2.1/../../../../arm-linux-musleabihf/bin/ld: /usr/arm-linux-musleabihf/lib/libatomic.so.1: error adding symbols: DSO missing from command line
> 2022-10-23T02:14:08.7257064Z collect2: error: ld returned 1 exit status
> ```
> 
> I assume that's why the armv6l-musl failed, I'll try building it locally as well.

Fails with the same error locally as well.

Re: ardour: update to 7.0.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/40054#issuecomment-1297260764

Comment:
grep srcpkgs for ATOMIC8, there's some examples for how to solve that 

Re: [PR PATCH] [Updated] ardour: update to 7.0.

[rantlivelintkale]

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

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

https://github.com/rantlivelintkale/void-packages update-ardour
https://github.com/void-linux/void-packages/pull/40054

ardour: update to 7.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl

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

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

From 959e48c6599bd3696e4188d92da02caa6b512ee4 Mon Sep 17 00:00:00 2001
From: Veikka Valtteri Kallinen <valtteri@kallinen.xyz>
Date: Wed, 19 Oct 2022 16:57:16 +0300
Subject: [PATCH] ardour: update to 7.0.

---
 .../patches/7.0-use-bundled-qm-dsp.patch      | 22 ++++++++
 .../ardour/patches/use-bundled-qm-dsp.patch   | 50 -------------------
 srcpkgs/ardour/template                       | 11 ++--
 3 files changed, 30 insertions(+), 53 deletions(-)
 create mode 100644 srcpkgs/ardour/patches/7.0-use-bundled-qm-dsp.patch
 delete mode 100644 srcpkgs/ardour/patches/use-bundled-qm-dsp.patch

diff --git a/srcpkgs/ardour/patches/7.0-use-bundled-qm-dsp.patch b/srcpkgs/ardour/patches/7.0-use-bundled-qm-dsp.patch
new file mode 100644
index 000000000000..0a217840d767
--- /dev/null
+++ b/srcpkgs/ardour/patches/7.0-use-bundled-qm-dsp.patch
@@ -0,0 +1,22 @@
+diff --git i/libs/qm-dsp/wscript w/libs/qm-dsp/wscript
+index a59801bf36..8432c89f0c 100644
+--- i/libs/qm-dsp/wscript
++++ w/libs/qm-dsp/wscript
+@@ -23,6 +23,7 @@ def options(opt):
+     autowaf.set_options(opt)
+ 
+ def configure(conf):
++    return
+     if conf.is_defined('USE_EXTERNAL_LIBS'):
+         conf.check_cxx(header_name="base/Pitch.h", mandatory=True, msg="Checking for qm-dsp headers")
+         conf.check_cxx(lib="qm-dsp", uselib_store="QMDSP", mandatory=True)
+@@ -51,9 +52,6 @@ def configure(conf):
+                            )
+ 
+ def build(bld):
+-    if bld.is_defined('USE_EXTERNAL_LIBS'):
+-        return
+-
+     # Host Library
+     obj = bld(features = 'c cxx cxxstlib')
+     obj.source = '''
diff --git a/srcpkgs/ardour/patches/use-bundled-qm-dsp.patch b/srcpkgs/ardour/patches/use-bundled-qm-dsp.patch
deleted file mode 100644
index 07e6c74963c1..000000000000
--- a/srcpkgs/ardour/patches/use-bundled-qm-dsp.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 2b5e890480691ce5a6c9f05b55e83a3b9ed8a8b9 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 9 Mar 2020 16:33:43 +0100
-Subject: [PATCH] use bundled qm-dsp
-
----
- libs/qm-dsp/wscript | 11 ++---------
- wscript             |  2 --
- 2 files changed, 2 insertions(+), 11 deletions(-)
-
-diff --git libs/qm-dsp/wscript libs/qm-dsp/wscript
-index 92dc9502b1..dbbff16722 100644
---- a/libs/qm-dsp/wscript
-+++ b/libs/qm-dsp/wscript
-@@ -23,17 +23,10 @@ def options(opt):
-     autowaf.set_options(opt)
- 
- def configure(conf):
--    if conf.is_defined('USE_EXTERNAL_LIBS'):
--        conf.check_cxx(header_name="base/Pitch.h", mandatory=True)
--        conf.check_cxx(lib="qm-dsp", uselib_store="QMDSP", mandatory=True)
--    else:
--        conf.load('compiler_cxx')
--        autowaf.configure(conf)
-+    conf.load('compiler_cxx')
-+    autowaf.configure(conf)
- 
- def build(bld):
--    if bld.is_defined('USE_EXTERNAL_LIBS'):
--        return
--
-     # Host Library
-     obj = bld(features = 'c cxx cxxstlib')
-     obj.source = '''
-diff --git wscript wscript
-index 4b5acb0ad7..c0358af37e 100644
---- a/wscript
-+++ b/wscript
-@@ -991,8 +991,6 @@ def configure(conf):
- 
-     if Options.options.use_external_libs:
-         conf.define('USE_EXTERNAL_LIBS', 1)
--        conf.env.append_value(
--            'CXXFLAGS', '-I' + Options.options.qm_dsp_include)
- 
-     if Options.options.boost_include != '':
-         conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include)
--- 
-2.25.1
-
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index 271e43f046ac..edd3c16fd464 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,7 +1,7 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.9
-revision=2
+version=7.0
+revision=1
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --configdir=/etc
@@ -21,7 +21,12 @@ homepage="http://ardour.org"
 
 CXXFLAGS="-fpermissive"
 PATH="/usr/libexec/chroot-git:$PATH"
-conf_files="/etc/ardour6/*"
+conf_files="/etc/ardour7/*"
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	LDFLAGS+=" -latomic"
+fi
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*)  configure_args+=" --dist-target=x86_64" ;;

Re: ardour: update to 7.0.

[rantlivelintkale]

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

New comment by rantlivelintkale on void-packages repository

https://github.com/void-linux/void-packages/pull/40054#issuecomment-1298921616

Comment:
> grep srcpkgs for ATOMIC8, there's some examples for how to solve that

Awesome. Should work now. At least it builds locally for armv6l-musl.

Re: [PR PATCH] [Merged]: ardour: update to 7.0.

[classabbyamp]

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

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

ardour: update to 7.0.
https://github.com/void-linux/void-packages/pull/40054

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

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl