From: ndowens <ndowens@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] ardour: update to 6.4.0
Date: Mon, 23 Nov 2020 00:42:31 +0100 [thread overview]
Message-ID: <20201122234231.l21sBmJHE9pF3LfglKJvtsEPzhe9s58P1r4pk2F60aM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26615@inbox.vuxu.org>
[-- 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() {
next prev parent reply other threads:[~2020-11-22 23:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-22 23:41 [PR PATCH] " ndowens
2020-11-22 23:42 ` ndowens [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201122234231.l21sBmJHE9pF3LfglKJvtsEPzhe9s58P1r4pk2F60aM@z \
--to=ndowens@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).