From 93c187a73925a5046ddc87a90bfa5a4111659a91 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 17 Feb 2021 15:19:02 +0100 Subject: [PATCH] ardour: update to 6.5.0 fix ARMv7 build --- .../patches/fix-musl-platform-detection.patch | 13 +++++++++++++ srcpkgs/ardour/template | 13 ++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/ardour/patches/fix-musl-platform-detection.patch diff --git a/srcpkgs/ardour/patches/fix-musl-platform-detection.patch b/srcpkgs/ardour/patches/fix-musl-platform-detection.patch new file mode 100644 index 00000000000..8f2d29cc423 --- /dev/null +++ b/srcpkgs/ardour/patches/fix-musl-platform-detection.patch @@ -0,0 +1,13 @@ +On musl libc only __linux__ is defined + +--- libs/vst3/pluginterfaces/base/fplatform.h ++++ libs/vst3/pluginterfaces/base/fplatform.h +@@ -86,7 +86,7 @@ + //----------------------------------------------------------------------------- + // LINUX + //----------------------------------------------------------------------------- +-#elif __gnu_linux__ ++#elif __linux__ + #define SMTG_OS_LINUX 1 + #define SMTG_OS_MACOS 0 + #define SMTG_OS_WINDOWS 0 diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template index fcedeb358a1..cfc1817c318 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,13 +27,7 @@ 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" ;; + armv7*) configure_args+=" --dist-target=armhf" ;; *) broken="Don't know build target" ;; esac