git » ardour.git » commit 9550511

diff --git a/.SRCINFO b/.SRCINFO
index 3bc53e5..733ad27 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ardour
 	pkgdesc = Professional-grade digital audio workstation
-	pkgver = 8.3
+	pkgver = 8.4
 	pkgrel = 1
 	url = https://ardour.org/
 	arch = x86_64
@@ -69,22 +69,16 @@ pkgbase = ardour
 	provides = vamp-host
 	provides = vst-host
 	provides = vst3-host
-	noextract = ardour-midi-8.3.zip
-	source = ardour::git+https://github.com/ardour/ardour.git#tag=6d34500e8da820ad257ee6009bfd8e7c3335d648
-	source = ardour-midi-8.3.zip::http://stuff.ardour.org/loops/ArdourBundledMedia.zip
+	noextract = ardour-midi-8.4.zip
+	source = ardour::git+https://github.com/ardour/ardour.git#tag=c35515e43d65bac23c89ae11cfbf2fed8c8f46b6
+	source = ardour-midi-8.4.zip::http://stuff.ardour.org/loops/ArdourBundledMedia.zip
 	source = ardour-7.0-re-vendor_qm-dsp.patch
-	source = ardour-8.3-aaflib.patch
-	source = ardour-8.3-iostream_taglib2.patch
 	sha512sums = SKIP
 	sha512sums = 94b681f989e834f5de25ce87da9c174b11d90617063f8c96147d7eb470391b35f6d54b85de16da8d963cacb01b50d1c1fab0fddd18eb3b086fe17124ecfa4f65
 	sha512sums = a3da14925bc25d8a57ba3e137c4b2b04010054667ac4ae2aec116ce6c157b03c9dd76bf4d73c313022282362d19b91683f062d6ab2ee0c73a576d3fa6272bd1d
-	sha512sums = c1b43bc694b306ffdbe3e5161bee0d1e0c8033ffdf1b9c4e9a0c2903e4ec9b09dd30719d08cdeac061fba985f20ca61ade5abb3d9fa0f0bcbd0399ebdcd67a79
-	sha512sums = 1cbdd0bc0d7d896c045f2253841703f8bc88295540be03a5ed4094c8ed1cb3cddc62e983a6bf3ef7290fd67fa0e8b13220fae6e9af87acf36cf9334f17cfcabe
 	b2sums = SKIP
 	b2sums = e31be6b51a217e2f7f799aa1d6e8c3cd024d80ab2d8d4371496a2b8bf0215749979217b565909841a346d6b3128fbfd674d2fae64b9fe741a5b418cd184c23be
 	b2sums = 73845adce9a48938cd7aef5fbc65f492e470de316620d278365d247c80caef44531e850fbd3d2f5de65a8562e67aabfd982c938439bd3670726a27bc003be017
-	b2sums = 824d66a6665e0c4d06f55448cafd61fa8aa376771d636cb8251baae0d3592baefff0c16a9c12fc0b9ea42f15e90928054423e77f8641f8232be64c71484261be
-	b2sums = 15efbb85a0fe275c094c1ed3f47311d51147b65e39c4369cdbe087cf68ee3dab5ecc92efe8a177b51ab8bf77b507de4209239efa88a135b0b1687fc46618febe
 
 pkgname = ardour
 	depends = cairo
diff --git a/PKGBUILD b/PKGBUILD
index a9eb4a3..aca1a79 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=ardour
-pkgver=8.3
-_commit=6d34500e8da820ad257ee6009bfd8e7c3335d648  # refs/tags/8.3^{}
+pkgver=8.4
+_commit=c35515e43d65bac23c89ae11cfbf2fed8c8f46b6  # refs/tags/8.4^{}
 pkgrel=1
 pkgdesc="Professional-grade digital audio workstation"
 arch=(x86_64)
@@ -88,20 +88,14 @@ source=(
   $pkgname::git+https://github.com/$pkgname/$pkgname.git#tag=$_commit
   $pkgname-midi-$pkgver.zip::http://stuff.ardour.org/loops/ArdourBundledMedia.zip
   $pkgname-7.0-re-vendor_qm-dsp.patch
-  $pkgname-8.3-aaflib.patch
-  $pkgname-8.3-iostream_taglib2.patch
 )
 noextract=($pkgname-midi-$pkgver.zip)
 sha512sums=('SKIP'
             '94b681f989e834f5de25ce87da9c174b11d90617063f8c96147d7eb470391b35f6d54b85de16da8d963cacb01b50d1c1fab0fddd18eb3b086fe17124ecfa4f65'
-            'a3da14925bc25d8a57ba3e137c4b2b04010054667ac4ae2aec116ce6c157b03c9dd76bf4d73c313022282362d19b91683f062d6ab2ee0c73a576d3fa6272bd1d'
-            'c1b43bc694b306ffdbe3e5161bee0d1e0c8033ffdf1b9c4e9a0c2903e4ec9b09dd30719d08cdeac061fba985f20ca61ade5abb3d9fa0f0bcbd0399ebdcd67a79'
-            '1cbdd0bc0d7d896c045f2253841703f8bc88295540be03a5ed4094c8ed1cb3cddc62e983a6bf3ef7290fd67fa0e8b13220fae6e9af87acf36cf9334f17cfcabe')
+            'a3da14925bc25d8a57ba3e137c4b2b04010054667ac4ae2aec116ce6c157b03c9dd76bf4d73c313022282362d19b91683f062d6ab2ee0c73a576d3fa6272bd1d')
 b2sums=('SKIP'
         'e31be6b51a217e2f7f799aa1d6e8c3cd024d80ab2d8d4371496a2b8bf0215749979217b565909841a346d6b3128fbfd674d2fae64b9fe741a5b418cd184c23be'
-        '73845adce9a48938cd7aef5fbc65f492e470de316620d278365d247c80caef44531e850fbd3d2f5de65a8562e67aabfd982c938439bd3670726a27bc003be017'
-        '824d66a6665e0c4d06f55448cafd61fa8aa376771d636cb8251baae0d3592baefff0c16a9c12fc0b9ea42f15e90928054423e77f8641f8232be64c71484261be'
-        '15efbb85a0fe275c094c1ed3f47311d51147b65e39c4369cdbe087cf68ee3dab5ecc92efe8a177b51ab8bf77b507de4209239efa88a135b0b1687fc46618febe')
+        '73845adce9a48938cd7aef5fbc65f492e470de316620d278365d247c80caef44531e850fbd3d2f5de65a8562e67aabfd982c938439bd3670726a27bc003be017')
 
 pkgver() {
   cd $pkgname
@@ -112,12 +106,6 @@ 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 issue with include path when using --use-external-libs
-  patch -Np1 -d $pkgname -i ../$pkgname-8.3-aaflib.patch
-
-  # add missing iostream include for taglib >= 2: https://github.com/Ardour/ardour/pull/868
-  patch -Np1 -d $pkgname -i ../$pkgname-8.3-iostream_taglib2.patch
-
   cd $pkgname
   # unsetting gtk2 rc (FS#54389)
   sed -e '8iexport GTK2_RC_FILES=/dev/null' -i gtk2_ardour/ardour.sh.in
diff --git a/ardour-8.3-aaflib.patch b/ardour-8.3-aaflib.patch
deleted file mode 100644
index 8b37c4e..0000000
--- a/ardour-8.3-aaflib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
-index af43c82722..0869f99a23 100644
---- a/gtk2_ardour/wscript
-+++ b/gtk2_ardour/wscript
-@@ -644,7 +644,7 @@ def build(bld):
-     else:
-         obj.uselib += ' GTKMM GTK'
- 
--    if bld.is_defined('USE_EXTERNAL_LIBS'):
-+    if False and bld.is_defined('USE_EXTERNAL_LIBS'):
-         obj.uselib += ' LIBAAF'
-     else:
-         obj.use.extend (['libaaf'])
diff --git a/ardour-8.3-iostream_taglib2.patch b/ardour-8.3-iostream_taglib2.patch
deleted file mode 100644
index 7246835..0000000
--- a/ardour-8.3-iostream_taglib2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f331ce72528a7cca35ede168d2fa26f9872a6e1e Mon Sep 17 00:00:00 2001
-From: David Runge <dave@sleepmap.de>
-Date: Tue, 20 Feb 2024 16:38:37 +0100
-Subject: [PATCH] Add missing include for iostream, needed for taglib >= 2
-
-Signed-off-by: David Runge <dave@sleepmap.de>
----
- libs/ardour/audiofile_tagger.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libs/ardour/audiofile_tagger.cc b/libs/ardour/audiofile_tagger.cc
-index 4c132cbcc6..e744561346 100644
---- a/libs/ardour/audiofile_tagger.cc
-+++ b/libs/ardour/audiofile_tagger.cc
-@@ -34,6 +34,8 @@
- #include <taglib/taglib.h>
- #include <taglib/xiphcomment.h>
- 
-+#include <iostream>
-+
- /* Convert string to TagLib::String */
- #define TL_STR(string) TagLib::String ((string).c_str(), TagLib::String::UTF8)
- 
--- 
-2.43.2
-