From 38adeae18ea9f5279c2ca1b397606042199fe739 Mon Sep 17 00:00:00 2001 From: Nathan Owens 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 +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 " 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() {