From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] ardour: update to 6.3.
Date: Mon, 21 Sep 2020 17:33:40 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25011@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 460 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages ardour-6.3-and-cross
https://github.com/void-linux/void-packages/pull/25011
ardour: update to 6.3.
Close: #24930
@q66 Please see if I screwed up powerpc, I don't know what is going on with armv[67] build, it try to simulate neon? I don't know.
A patch file from https://github.com/void-linux/void-packages/pull/25011.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ardour-6.3-and-cross-25011.patch --]
[-- Type: text/x-diff, Size: 6278 bytes --]
From 1fe9981c0ff62c10cac2edebe5b3370948a6b11c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 18 Sep 2020 22:59:48 +0700
Subject: [PATCH] ardour: update to 6.3.
Close: #24930
---
srcpkgs/ardour/patches/6.0-fix-runtime.patch | 17 +++-----
.../patches/do-not-install-wscript.patch | 22 ----------
srcpkgs/ardour/patches/ppc64.patch | 22 ----------
srcpkgs/ardour/template | 41 +++++++++++++++----
4 files changed, 39 insertions(+), 63 deletions(-)
delete mode 100644 srcpkgs/ardour/patches/do-not-install-wscript.patch
delete mode 100644 srcpkgs/ardour/patches/ppc64.patch
diff --git a/srcpkgs/ardour/patches/6.0-fix-runtime.patch b/srcpkgs/ardour/patches/6.0-fix-runtime.patch
index 3b60f99f319..debae965a95 100644
--- a/srcpkgs/ardour/patches/6.0-fix-runtime.patch
+++ b/srcpkgs/ardour/patches/6.0-fix-runtime.patch
@@ -1,16 +1,11 @@
-diff --git libs/pbd/pbd/pthread_utils.h libs/pbd/pbd/pthread_utils.h
-index 6eedbd9..c459a97 100644
---- libs/pbd/pbd/pthread_utils.h
-+++ libs/pbd/pbd/pthread_utils.h
-@@ -49,7 +49,7 @@
- #include "pbd/signals.h"
+--- libs/pbd/pbd/pthread_utils.h.orig 2020-09-18 22:30:18.353441907 +0700
++++ libs/pbd/pbd/pthread_utils.h 2020-09-18 22:37:07.059363532 +0700
+@@ -54,7 +54,7 @@
+ # define PBD_RT_STACKSIZE_PROC 0x20000 // 128kB
+ #endif
- #define PBD_RT_STACKSIZE_PROC 0x20000 // 128kB
-#define PBD_RT_STACKSIZE_HELP 0x08000 // 32kB
-+#define PBD_RT_STACKSIZE_HELP PBD_RT_STACKSIZE_PROC
++#define PBD_RT_STACKSIZE_HELP PBD_RT_STACKSIZE_PROC // 32kB
/* these are relative to sched_get_priority_max()
* see pbd_absolute_rt_priority()
---
-2.26.2
-
diff --git a/srcpkgs/ardour/patches/do-not-install-wscript.patch b/srcpkgs/ardour/patches/do-not-install-wscript.patch
deleted file mode 100644
index c2403e8e095..00000000000
--- a/srcpkgs/ardour/patches/do-not-install-wscript.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From a5ec4fa3acd4837e5c5914d9ce67b7bc32d4fcfb Mon Sep 17 00:00:00 2001
-From: Guido Aulisi <guido.aulisi@gmail.com>
-Date: Wed, 27 May 2020 17:23:04 +0200
-Subject: [PATCH] Do not install wscript
-
----
- share/plugin_metadata/wscript | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git share/plugin_metadata/wscript share/plugin_metadata/wscript
-index b7aaa92ac1..9f2559095c 100644
---- share/plugin_metadata/wscript
-+++ share/plugin_metadata/wscript
-@@ -9,7 +9,7 @@ def configure(conf):
- pass
-
- def build(bld):
-- maps = bld.path.ant_glob ('*')
-+ maps = bld.path.ant_glob ('plugin*')
- bld.install_files (os.path.join(bld.env['DATADIR'], 'plugin_metadata'),
- maps)
-
diff --git a/srcpkgs/ardour/patches/ppc64.patch b/srcpkgs/ardour/patches/ppc64.patch
deleted file mode 100644
index f6344acd953..00000000000
--- a/srcpkgs/ardour/patches/ppc64.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 2a456c19214ce82c257a222e8de31af6113aa8d7 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@tiptoe.de>
-Date: Wed, 3 Jun 2020 10:23:03 +0200
-Subject: [PATCH] Add `cycles_t` type definition on ppc64
-
-Signed-off-by: Nils Philippsen <nils@tiptoe.de>
----
- libs/ardour/ardour/cycles.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libs/ardour/ardour/cycles.h b/libs/ardour/ardour/cycles.h
-index 646dd9d67a..ee0f926534 100644
---- libs/ardour/ardour/cycles.h
-+++ libs/ardour/ardour/cycles.h
-@@ -74,6 +74,7 @@ static inline cycles_t get_cycles (void)
-
- #elif defined(__powerpc64__)
-
-+typedef uint64_t cycles_t;
- static inline cycles_t get_cycles(void)
- {
- #warning You are compiling libardour on a platform for which ardour/cycles.h needs work
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index e9ec7f5562c..c88e9fcd9df 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,22 +1,47 @@
# Template file for 'ardour'
pkgname=ardour
-version=6.0
+version=6.3
revision=1
+wrksrc="Ardour-${version}.0"
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
- --libjack=weak --optimize --docs --use-external-libs"
-hostmakedepends="python3 git graphviz doxygen pkg-config clang perl"
+ --libjack=weak --optimize --docs --use-external-libs --freedesktop"
+hostmakedepends="python3 git graphviz doxygen pkg-config clang perl
+ itstool gettext tar readline-devel"
makedepends="boost-devel liblrdf-devel liblo-devel lilv-devel suil-devel
taglib-devel aubio-devel rubberband-devel alsa-lib-devel libsndfile-devel
vamp-plugin-sdk-devel fftw-devel jack-devel libsamplerate-devel lv2
sratom-devel gtkmm2-devel libarchive-devel fluidsynth-devel hidapi-devel
- libltc-devel"
+ libltc-devel glibmm-devel"
short_desc="Professional-grade digital audio workstation"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://ardour.org"
-nocross="executes test binaries during configure"
+distfiles="https://community.ardour.org/src/Ardour-${version}.0.tar.bz2"
+checksum=93418636d7d93f66bdf479ed5bf3c6b0cc0198dc8f76c5555110d3147e4ec74b
-do_fetch() {
- git clone --depth 1 --branch=$version https://github.com/Ardour/ardour $pkgname-$version
+case "$XBPS_TARGET_MACHINE" in
+ x86_64*) configure_args+=" --dist-target=x86_64" ;;
+ i686*) configure_args+=" --dist-target=i686" ;;
+ aarch64*) configure_args+=" --dist-target=aarch64" ;;
+ arm*) broken="glibmm/threads.h not found, wth is going on?" ;;
+ # Some armv7 doesn't have NEON
+ armv7*) configure_args+=" --dist-target=armhf --no-fpu-optimization" ;;
+ armv6*) configure_args+=" --dist-target=arm" ;;
+ ppc64*) configure_args+=" --dist-target=ppc64" ;;
+ ppc) configure_args+=" --dist-target=ppc" ;;
+ *) broken="Don't know build target" ;;
+esac
+CFLAGS="-I$XBPS_CROSS_BASE/usr/include/glibmm-2.4"
+
+post_install() {
+ vinstall build/gtk2_ardour/ardour.xml 644 usr/share/mime/packages
+ vinstall "build/gtk2_ardour/ardour${version%%.*}.desktop" \
+ 644 usr/share/applications
+ for size in 16 22 32 48 256 512; do
+ vinstall gtk2_ardour/resources/Ardour-icon_${size}px.png 644 \
+ usr/share/icons/hicolor/${size}x${size}/apps \
+ ardour${version%%.*}.png
+ done
+ vman ardour.1
}
next reply other threads:[~2020-09-21 15:33 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-21 15:33 sgn [this message]
2020-09-21 17:30 ` [PR REVIEW] " Chocimier
2020-09-21 17:30 ` Chocimier
2020-09-21 17:30 ` Chocimier
2020-09-21 23:35 ` sgn
2020-09-21 23:35 ` sgn
2020-09-21 23:35 ` sgn
2020-09-21 23:47 ` q66
2020-09-21 23:49 ` q66
2020-09-22 13:59 ` sgn
2020-09-22 15:09 ` [PR PATCH] [Closed]: " sgn
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25011@inbox.vuxu.org \
--to=sgn@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).