Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages /
ardour
Commits:
80ab14fa by Antonio Rojas at 2024-09-13T23:29:06+02:00
upgpkg: 8.6-2: Fix metainfo install dir, build with internal waf since 2.1 is
not supported
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + ardour-boost-1.85.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = ardour
pkgdesc = Professional-grade digital audio workstation
pkgver = 8.6
- pkgrel = 1
+ pkgrel = 2
url = https://ardour.org/
arch = x86_64
groups = pro-audio
@@ -73,12 +73,15 @@ pkgbase = ardour
source = ardour::git+https://github.com/ardour/ardour.git#tag=8.6
source =
ardour-midi-8.6.zip::http://stuff.ardour.org/loops/ArdourBundledMedia.zip
source = ardour-7.0-re-vendor_qm-dsp.patch
+ source = ardour-boost-1.85.patch
sha512sums =
8e7c52866a1084484e7ba6089334199d4f2c0f5e221f8b8ab4fed49ffdfbc3aef747ecbf7abd9d25355fc9ed270b7f7ee9f8250e7b5c59a6e140b7d59469bfc6
sha512sums =
94b681f989e834f5de25ce87da9c174b11d90617063f8c96147d7eb470391b35f6d54b85de16da8d963cacb01b50d1c1fab0fddd18eb3b086fe17124ecfa4f65
sha512sums =
a3da14925bc25d8a57ba3e137c4b2b04010054667ac4ae2aec116ce6c157b03c9dd76bf4d73c313022282362d19b91683f062d6ab2ee0c73a576d3fa6272bd1d
+ sha512sums =
ad4888bbda5da5ba3e49ca751bdec34159fde01355e8dac3e23c968a8eeba4bce3228f43ef87977ee619c70063ef16e2383c6b7126213d88125222431f79574d
b2sums =
afdc958c7a827fd6dd965900fb84aa32d570bc003d1e00213a2e26e56ca74dff522d32e1170bd113527caa5ea237898e28dc804a0da2ee47ff1b02f5f004ef2a
b2sums =
e31be6b51a217e2f7f799aa1d6e8c3cd024d80ab2d8d4371496a2b8bf0215749979217b565909841a346d6b3128fbfd674d2fae64b9fe741a5b418cd184c23be
b2sums =
73845adce9a48938cd7aef5fbc65f492e470de316620d278365d247c80caef44531e850fbd3d2f5de65a8562e67aabfd982c938439bd3670726a27bc003be017
+ b2sums =
9a86275431cb735b32b36a570450d4b5c035f1360c89e69d7d688171e299aea15128057f01dd905335c4fca68035a146cc54cd62b0aa163ec56ae06e545ca8ad
pkgname = ardour
depends = cairo
=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
pkgname=ardour
pkgver=8.6
-pkgrel=1
+pkgrel=2
pkgdesc="Professional-grade digital audio workstation"
arch=(x86_64)
url="https://ardour.org/";
@@ -87,14 +87,17 @@ source=(
$pkgname::git+https://github.com/$pkgname/$pkgname.git#tag=$pkgver
$pkgname-midi-$pkgver.zip::http://stuff.ardour.org/loops/ArdourBundledMedia.zip
$pkgname-7.0-re-vendor_qm-dsp.patch
+ ardour-boost-1.85.patch
)
noextract=($pkgname-midi-$pkgver.zip)
sha512sums=('8e7c52866a1084484e7ba6089334199d4f2c0f5e221f8b8ab4fed49ffdfbc3aef747ecbf7abd9d25355fc9ed270b7f7ee9f8250e7b5c59a6e140b7d59469bfc6'
'94b681f989e834f5de25ce87da9c174b11d90617063f8c96147d7eb470391b35f6d54b85de16da8d963cacb01b50d1c1fab0fddd18eb3b086fe17124ecfa4f65'
-
'a3da14925bc25d8a57ba3e137c4b2b04010054667ac4ae2aec116ce6c157b03c9dd76bf4d73c313022282362d19b91683f062d6ab2ee0c73a576d3fa6272bd1d')
+
'a3da14925bc25d8a57ba3e137c4b2b04010054667ac4ae2aec116ce6c157b03c9dd76bf4d73c313022282362d19b91683f062d6ab2ee0c73a576d3fa6272bd1d'
+
'ad4888bbda5da5ba3e49ca751bdec34159fde01355e8dac3e23c968a8eeba4bce3228f43ef87977ee619c70063ef16e2383c6b7126213d88125222431f79574d')
b2sums=('afdc958c7a827fd6dd965900fb84aa32d570bc003d1e00213a2e26e56ca74dff522d32e1170bd113527caa5ea237898e28dc804a0da2ee47ff1b02f5f004ef2a'
'e31be6b51a217e2f7f799aa1d6e8c3cd024d80ab2d8d4371496a2b8bf0215749979217b565909841a346d6b3128fbfd674d2fae64b9fe741a5b418cd184c23be'
-
'73845adce9a48938cd7aef5fbc65f492e470de316620d278365d247c80caef44531e850fbd3d2f5de65a8562e67aabfd982c938439bd3670726a27bc003be017')
+
'73845adce9a48938cd7aef5fbc65f492e470de316620d278365d247c80caef44531e850fbd3d2f5de65a8562e67aabfd982c938439bd3670726a27bc003be017'
+
'9a86275431cb735b32b36a570450d4b5c035f1360c89e69d7d688171e299aea15128057f01dd905335c4fca68035a146cc54cd62b0aa163ec56ae06e545ca8ad')
pkgver() {
cd $pkgname
@@ -104,6 +107,8 @@ pkgver() {
prepare() {
# using vendored version of qm-dsp because qm-dsp >= 1.8.0 is not compatible
patch -Np1 -d $pkgname -i ../$pkgname-7.0-re-vendor_qm-dsp.patch
+ # Fix build with boost 1.85 (Gentoo)
+ patch -p1 -d $pkgname -i ../ardour-boost-1.85.patch
cd $pkgname
# unsetting gtk2 rc (FS#54389)
@@ -138,8 +143,8 @@ build() {
cd $pkgname
export LINKFLAGS="$LDFLAGS"
- waf configure "${waf_configure_options[@]}"
- waf build -v
+ ./waf configure "${waf_configure_options[@]}"
+ ./waf build -v
}
package() {
@@ -176,9 +181,10 @@ package() {
(
cd $pkgname
- waf i18n --destdir="$pkgdir"
- waf install --destdir="$pkgdir"
+ ./waf i18n --destdir="$pkgdir"
+ ./waf install --destdir="$pkgdir"
install -vDm 644 $pkgname.1 -t "$pkgdir/usr/share/man/man1/"
+ mv "$pkgdir"/usr/share/{appdata,metainfo}
)
# installation of MIDI files is a bit of a horrorshow, as upstream is not
flexible about tarball naming, etc.
=====================================
ardour-boost-1.85.patch
=====================================
@@ -0,0 +1,19 @@
+--- Ardour-8.6.0.orig/libs/surfaces/websockets/message.cc
++++ Ardour-8.6.0/libs/surfaces/websockets/message.cc
+@@ -58,14 +58,14 @@ NodeStateMessage::NodeStateMessage (void
+
+ _state = NodeState (root.get<std::string> ("node"));
+
+- pt::ptree addr = root.get_child ("addr", pt::ptree ());
++ pt::ptree addr = root.get_child ("addr");
+
+ for (pt::ptree::iterator it = addr.begin (); it != addr.end ();
++it) {
+ // throws if datatype not uint32_t
+ _state.add_addr (boost::lexical_cast<uint32_t>
(it->second.data ()));
+ }
+
+- pt::ptree val = root.get_child ("val", pt::ptree ());
++ pt::ptree val = root.get_child ("val");
+
+ for (pt::ptree::iterator it = val.begin (); it != val.end ();
++it) {
+ std::string val = it->second.data ();
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/ardour/-/commit/80ab14fa3fd16d15685e55f559f3b9d098e7d514
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/ardour/-/commit/80ab14fa3fd16d15685e55f559f3b9d098e7d514
You're receiving this email because of your account on gitlab.archlinux.org.
