git » ardour.git » commit ee46e5c

upgpkg: 8.8-1

author David Runge
2024-10-06 09:44:22 UTC
committer David Runge
2024-10-06 09:44:22 UTC
parent 80ab14fa3fd16d15685e55f559f3b9d098e7d514

upgpkg: 8.8-1

.SRCINFO +7 -10
PKGBUILD +6 -11
ardour-boost-1.85.patch +0 -19

diff --git a/.SRCINFO b/.SRCINFO
index c83a161..17ea7b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ardour
 	pkgdesc = Professional-grade digital audio workstation
-	pkgver = 8.6
-	pkgrel = 2
+	pkgver = 8.8
+	pkgrel = 1
 	url = https://ardour.org/
 	arch = x86_64
 	groups = pro-audio
@@ -69,19 +69,16 @@ pkgbase = ardour
 	provides = vamp-host
 	provides = vst-host
 	provides = vst3-host
-	noextract = ardour-midi-8.6.zip
-	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
+	noextract = ardour-midi-8.8.zip
+	source = ardour::git+https://github.com/ardour/ardour.git#tag=8.8
+	source = ardour-midi-8.8.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 = c83d0ad2829d9c5b305de1be24fdf71d6fac8d2bebe6bd850a0e25b7a9b27153b3c16f601945106d52eb6c3dc8f08fb3f41282f6b2a47fc3d9ea169573510227
 	sha512sums = 94b681f989e834f5de25ce87da9c174b11d90617063f8c96147d7eb470391b35f6d54b85de16da8d963cacb01b50d1c1fab0fddd18eb3b086fe17124ecfa4f65
 	sha512sums = a3da14925bc25d8a57ba3e137c4b2b04010054667ac4ae2aec116ce6c157b03c9dd76bf4d73c313022282362d19b91683f062d6ab2ee0c73a576d3fa6272bd1d
-	sha512sums = ad4888bbda5da5ba3e49ca751bdec34159fde01355e8dac3e23c968a8eeba4bce3228f43ef87977ee619c70063ef16e2383c6b7126213d88125222431f79574d
-	b2sums = afdc958c7a827fd6dd965900fb84aa32d570bc003d1e00213a2e26e56ca74dff522d32e1170bd113527caa5ea237898e28dc804a0da2ee47ff1b02f5f004ef2a
+	b2sums = 3df36f5a7dfdb0d5f88f8aebd1a93c5fb1c7840720d258dcf5aeb5275542a73127fbb3233b8315d84594239c037c8b88d6573827261fff15e58e480ae0e2f032
 	b2sums = e31be6b51a217e2f7f799aa1d6e8c3cd024d80ab2d8d4371496a2b8bf0215749979217b565909841a346d6b3128fbfd674d2fae64b9fe741a5b418cd184c23be
 	b2sums = 73845adce9a48938cd7aef5fbc65f492e470de316620d278365d247c80caef44531e850fbd3d2f5de65a8562e67aabfd982c938439bd3670726a27bc003be017
-	b2sums = 9a86275431cb735b32b36a570450d4b5c035f1360c89e69d7d688171e299aea15128057f01dd905335c4fca68035a146cc54cd62b0aa163ec56ae06e545ca8ad
 
 pkgname = ardour
 	depends = cairo
diff --git a/PKGBUILD b/PKGBUILD
index 2b6da49..7768064 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=ardour
-pkgver=8.6
-pkgrel=2
+pkgver=8.8
+pkgrel=1
 pkgdesc="Professional-grade digital audio workstation"
 arch=(x86_64)
 url="https://ardour.org/"
@@ -87,17 +87,14 @@ 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'
+sha512sums=('c83d0ad2829d9c5b305de1be24fdf71d6fac8d2bebe6bd850a0e25b7a9b27153b3c16f601945106d52eb6c3dc8f08fb3f41282f6b2a47fc3d9ea169573510227'
             '94b681f989e834f5de25ce87da9c174b11d90617063f8c96147d7eb470391b35f6d54b85de16da8d963cacb01b50d1c1fab0fddd18eb3b086fe17124ecfa4f65'
-            'a3da14925bc25d8a57ba3e137c4b2b04010054667ac4ae2aec116ce6c157b03c9dd76bf4d73c313022282362d19b91683f062d6ab2ee0c73a576d3fa6272bd1d'
-            'ad4888bbda5da5ba3e49ca751bdec34159fde01355e8dac3e23c968a8eeba4bce3228f43ef87977ee619c70063ef16e2383c6b7126213d88125222431f79574d')
-b2sums=('afdc958c7a827fd6dd965900fb84aa32d570bc003d1e00213a2e26e56ca74dff522d32e1170bd113527caa5ea237898e28dc804a0da2ee47ff1b02f5f004ef2a'
+            'a3da14925bc25d8a57ba3e137c4b2b04010054667ac4ae2aec116ce6c157b03c9dd76bf4d73c313022282362d19b91683f062d6ab2ee0c73a576d3fa6272bd1d')
+b2sums=('3df36f5a7dfdb0d5f88f8aebd1a93c5fb1c7840720d258dcf5aeb5275542a73127fbb3233b8315d84594239c037c8b88d6573827261fff15e58e480ae0e2f032'
         'e31be6b51a217e2f7f799aa1d6e8c3cd024d80ab2d8d4371496a2b8bf0215749979217b565909841a346d6b3128fbfd674d2fae64b9fe741a5b418cd184c23be'
-        '73845adce9a48938cd7aef5fbc65f492e470de316620d278365d247c80caef44531e850fbd3d2f5de65a8562e67aabfd982c938439bd3670726a27bc003be017'
-        '9a86275431cb735b32b36a570450d4b5c035f1360c89e69d7d688171e299aea15128057f01dd905335c4fca68035a146cc54cd62b0aa163ec56ae06e545ca8ad')
+        '73845adce9a48938cd7aef5fbc65f492e470de316620d278365d247c80caef44531e850fbd3d2f5de65a8562e67aabfd982c938439bd3670726a27bc003be017')
 
 pkgver() {
   cd $pkgname
@@ -107,8 +104,6 @@ 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)
diff --git a/ardour-boost-1.85.patch b/ardour-boost-1.85.patch
deleted file mode 100644
index ffa8a6b..0000000
--- a/ardour-boost-1.85.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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 ();