* [PR PATCH] ardour: update to 6.4.0
@ 2020-11-22 23:41 ndowens
2020-11-22 23:42 ` [PR PATCH] [Updated] " ndowens
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: ndowens @ 2020-11-22 23:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 354 bytes --]
There is a new pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages ardour
https://github.com/void-linux/void-packages/pull/26615
ardour: update to 6.4.0
Also fix ARM build; It was using host x86 flags
A patch file from https://github.com/void-linux/void-packages/pull/26615.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ardour-26615.patch --]
[-- Type: text/x-diff, Size: 3074 bytes --]
From 4f92715de87531de1dfcb8a8a8dcf8011ac43be4 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 22 Nov 2020 17:41:33 -0600
Subject: [PATCH] ardour: update to 6.4.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..9918e0c64ad 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.4.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=88681db5423a2283bbe9b48400a8745cdd50d70ddcef0d9039724887cf43278d
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() {
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] ardour: update to 6.4.0
2020-11-22 23:41 [PR PATCH] ardour: update to 6.4.0 ndowens
@ 2020-11-22 23:42 ` ndowens
2020-11-23 0:53 ` [PR PATCH] [Closed]: " ndowens
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ndowens @ 2020-11-22 23:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 359 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages ardour
https://github.com/void-linux/void-packages/pull/26615
ardour: update to 6.4.0
Also fix ARM build; It was using host x86 flags
A patch file from https://github.com/void-linux/void-packages/pull/26615.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ardour-26615.patch --]
[-- Type: text/x-diff, Size: 3073 bytes --]
From 2c562e237abdd14425ecd1de04208bd1afbe3f35 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 22 Nov 2020 17:41:33 -0600
Subject: [PATCH] ardour: update to 6.4.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..cb593d89bd5 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.4.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=88681db5423a2283bbe9b48400a8745cdd50d70ddcef0d9039724887cf43278d
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() {
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Closed]: ardour: update to 6.4.0
2020-11-22 23:41 [PR PATCH] ardour: update to 6.4.0 ndowens
2020-11-22 23:42 ` [PR PATCH] [Updated] " ndowens
@ 2020-11-23 0:53 ` ndowens
2020-12-27 16:52 ` [PR PATCH] [Updated] ardour: update to 6.5.0 ndowens
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ndowens @ 2020-11-23 0:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
There's a closed pull request on the void-packages repository
ardour: update to 6.4.0
https://github.com/void-linux/void-packages/pull/26615
Description:
Also fix ARM build; It was using host x86 flags
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] ardour: update to 6.5.0
2020-11-22 23:41 [PR PATCH] ardour: update to 6.4.0 ndowens
2020-11-22 23:42 ` [PR PATCH] [Updated] " ndowens
2020-11-23 0:53 ` [PR PATCH] [Closed]: " ndowens
@ 2020-12-27 16:52 ` ndowens
2020-12-27 18:46 ` [PR REVIEW] " ericonr
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ndowens @ 2020-12-27 16:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 359 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages ardour
https://github.com/void-linux/void-packages/pull/26615
ardour: update to 6.5.0
Also fix ARM build; It was using host x86 flags
A patch file from https://github.com/void-linux/void-packages/pull/26615.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ardour-26615.patch --]
[-- Type: text/x-diff, Size: 3413 bytes --]
From 9bc1ac2f6c7bcc63f5d542b293e7c596d8710c4d Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 22 Nov 2020 17:41:33 -0600
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 | 15 +++++----------
2 files changed, 32 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..26241659f24 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,14 +27,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() {
^ permalink raw reply [flat|nested] 9+ 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
` (2 preceding siblings ...)
2020-12-27 16:52 ` [PR PATCH] [Updated] ardour: update to 6.5.0 ndowens
@ 2020-12-27 18:46 ` ericonr
2020-12-27 18:46 ` ericonr
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ 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] 9+ 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
` (3 preceding siblings ...)
2020-12-27 18:46 ` [PR REVIEW] " ericonr
@ 2020-12-27 18:46 ` ericonr
2020-12-27 19:11 ` [PR PATCH] [Updated] " ndowens
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ 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] 9+ messages in thread
* Re: [PR PATCH] [Updated] ardour: update to 6.5.0
2020-11-22 23:41 [PR PATCH] ardour: update to 6.4.0 ndowens
` (4 preceding siblings ...)
2020-12-27 18:46 ` ericonr
@ 2020-12-27 19:11 ` ndowens
2020-12-27 19:12 ` ndowens
2021-02-19 6:12 ` [PR PATCH] [Closed]: " ericonr
7 siblings, 0 replies; 9+ messages in thread
From: ndowens @ 2020-12-27 19:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 359 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages ardour
https://github.com/void-linux/void-packages/pull/26615
ardour: update to 6.5.0
Also fix ARM build; It was using host x86 flags
A patch file from https://github.com/void-linux/void-packages/pull/26615.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ardour-26615.patch --]
[-- Type: text/x-diff, Size: 3731 bytes --]
From 38adeae18ea9f5279c2ca1b397606042199fe739 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 22 Nov 2020 17:41:33 -0600
Subject: [PATCH] ardour: update to 6.5.0
Also fix ARM build; It was using host x86 flags
---
srcpkgs/ardour/patches/arm.patch | 37 ++++++++++++++++++++++++++++++++
srcpkgs/ardour/template | 15 +++++--------
2 files changed, 42 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..591385abc63
--- /dev/null
+++ b/srcpkgs/ardour/patches/arm.patch
@@ -0,0 +1,37 @@
+From 8009b80450143c439fcd940c1f5fa4173013d9b5 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Sun, 27 Dec 2020 13:11:09 -0600
+Subject: [PATCH] arm
+
+config script detects host CPU and enables x86 flags
+which are incompatible with ARM*
+---
+ wscript | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git wscript wscript
+index 291e234..27d45e9 100644
+--- wscript
++++ wscript
+@@ -531,18 +531,6 @@ int main() { return 0; }''',
+ # determine processor flags via /proc/cpuinfo
+ #
+
+- if conf.env['build_target'] != 'i386':
+-
+- flag_line = os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1]
+- x86_flags = flag_line.split (": ")[1:][0].split ()
+-
+- if "mmx" in x86_flags:
+- compiler_flags.append ("-mmmx")
+- if "sse" in x86_flags:
+- build_host_supports_sse = True
+- if "3dnow" in x86_flags:
+- compiler_flags.append ("-m3dnow")
+-
+ if cpu == "i586":
+ compiler_flags.append ("-march=i586")
+ elif cpu == "i686":
+--
+2.29.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index fcedeb358a1..26241659f24 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,14 +27,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() {
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] ardour: update to 6.5.0
2020-11-22 23:41 [PR PATCH] ardour: update to 6.4.0 ndowens
` (5 preceding siblings ...)
2020-12-27 19:11 ` [PR PATCH] [Updated] " ndowens
@ 2020-12-27 19:12 ` ndowens
2021-02-19 6:12 ` [PR PATCH] [Closed]: " ericonr
7 siblings, 0 replies; 9+ messages in thread
From: ndowens @ 2020-12-27 19:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 359 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages ardour
https://github.com/void-linux/void-packages/pull/26615
ardour: update to 6.5.0
Also fix ARM build; It was using host x86 flags
A patch file from https://github.com/void-linux/void-packages/pull/26615.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ardour-26615.patch --]
[-- Type: text/x-diff, Size: 3731 bytes --]
From a5db5758a1363c8e39624ac3f2cf54d75a9ca751 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 22 Nov 2020 17:41:33 -0600
Subject: [PATCH] ardour: update to 6.5.0
Also fix ARM build; It was using host x86 flags
---
srcpkgs/ardour/patches/arm.patch | 37 ++++++++++++++++++++++++++++++++
srcpkgs/ardour/template | 15 +++++--------
2 files changed, 42 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..591385abc63
--- /dev/null
+++ b/srcpkgs/ardour/patches/arm.patch
@@ -0,0 +1,37 @@
+From 8009b80450143c439fcd940c1f5fa4173013d9b5 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Sun, 27 Dec 2020 13:11:09 -0600
+Subject: [PATCH] arm
+
+config script detects host CPU and enables x86 flags
+which are incompatible with ARM*
+---
+ wscript | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git wscript wscript
+index 291e234..27d45e9 100644
+--- wscript
++++ wscript
+@@ -531,18 +531,6 @@ int main() { return 0; }''',
+ # determine processor flags via /proc/cpuinfo
+ #
+
+- if conf.env['build_target'] != 'i386':
+-
+- flag_line = os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1]
+- x86_flags = flag_line.split (": ")[1:][0].split ()
+-
+- if "mmx" in x86_flags:
+- compiler_flags.append ("-mmmx")
+- if "sse" in x86_flags:
+- build_host_supports_sse = True
+- if "3dnow" in x86_flags:
+- compiler_flags.append ("-m3dnow")
+-
+ if cpu == "i586":
+ compiler_flags.append ("-march=i586")
+ elif cpu == "i686":
+--
+2.29.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index fcedeb358a1..9b5cbfcc92e 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,14 +27,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() {
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Closed]: ardour: update to 6.5.0
2020-11-22 23:41 [PR PATCH] ardour: update to 6.4.0 ndowens
` (6 preceding siblings ...)
2020-12-27 19:12 ` ndowens
@ 2021-02-19 6:12 ` ericonr
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-02-19 6:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
There's a closed pull request on the void-packages repository
ardour: update to 6.5.0
https://github.com/void-linux/void-packages/pull/26615
Description:
Also fix ARM build; It was using host x86 flags
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-02-19 6:12 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-22 23:41 [PR PATCH] ardour: update to 6.4.0 ndowens
2020-11-22 23:42 ` [PR PATCH] [Updated] " ndowens
2020-11-23 0:53 ` [PR PATCH] [Closed]: " ndowens
2020-12-27 16:52 ` [PR PATCH] [Updated] ardour: update to 6.5.0 ndowens
2020-12-27 18:46 ` [PR REVIEW] " ericonr
2020-12-27 18:46 ` ericonr
2020-12-27 19:11 ` [PR PATCH] [Updated] " ndowens
2020-12-27 19:12 ` ndowens
2021-02-19 6:12 ` [PR PATCH] [Closed]: " 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).