Github messages for voidlinux
 help / color / mirror / Atom feed
* [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; 10+ 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] 10+ messages in thread
* [PR PATCH] ardour: update to 6.5.0
@ 2020-12-27 17:21 tibequadorian
  2020-12-27 18:01 ` [PR PATCH] [Closed]: " tibequadorian
  0 siblings, 1 reply; 10+ messages in thread
From: tibequadorian @ 2020-12-27 17:21 UTC (permalink / raw)
  To: ml

[-- 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() {

^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-02-19  6:12 UTC | newest]

Thread overview: 10+ 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
2020-12-27 17:21 [PR PATCH] " tibequadorian
2020-12-27 18:01 ` [PR PATCH] [Closed]: " tibequadorian

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