git » ardour.git » commit c917071

diff --git a/.SRCINFO b/.SRCINFO
index e7ff879..1a87362 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ardour
 	pkgdesc = Professional-grade digital audio workstation
-	pkgver = 8.1
+	pkgver = 8.2
 	pkgrel = 1
 	url = https://ardour.org/
 	arch = x86_64
@@ -72,16 +72,19 @@ pkgbase = ardour
 	provides = vamp-host
 	provides = vst-host
 	provides = vst3-host
-	noextract = ardour-midi-8.1.zip
-	source = ardour::git+https://github.com/ardour/ardour.git#tag=9138fb9913f6ead7516ac58d24ca81c795c225b9
-	source = ardour-midi-8.1.zip::http://stuff.ardour.org/loops/ArdourBundledMedia.zip
+	noextract = ardour-midi-8.2.zip
+	source = ardour::git+https://github.com/ardour/ardour.git#tag=92d6cb993391a37dcf3bd494707117ed63a4e7c4
+	source = ardour-midi-8.2.zip::http://stuff.ardour.org/loops/ArdourBundledMedia.zip
 	source = ardour-7.0-re-vendor_qm-dsp.patch
+	source = ardour-8.2-revendor_libaaf.patch
 	sha512sums = SKIP
 	sha512sums = 94b681f989e834f5de25ce87da9c174b11d90617063f8c96147d7eb470391b35f6d54b85de16da8d963cacb01b50d1c1fab0fddd18eb3b086fe17124ecfa4f65
 	sha512sums = a3da14925bc25d8a57ba3e137c4b2b04010054667ac4ae2aec116ce6c157b03c9dd76bf4d73c313022282362d19b91683f062d6ab2ee0c73a576d3fa6272bd1d
+	sha512sums = 29e5ded8860f09ab477b2e198175e2efac406799a5de6711944c23cf6e8940d56d94120dae57d42cb57baf5cffbd2c880340655722a7f31c6a2ac3b81fac73ed
 	b2sums = SKIP
 	b2sums = e31be6b51a217e2f7f799aa1d6e8c3cd024d80ab2d8d4371496a2b8bf0215749979217b565909841a346d6b3128fbfd674d2fae64b9fe741a5b418cd184c23be
 	b2sums = 73845adce9a48938cd7aef5fbc65f492e470de316620d278365d247c80caef44531e850fbd3d2f5de65a8562e67aabfd982c938439bd3670726a27bc003be017
+	b2sums = b3c1257d26eb89193b255c773b6a19de247056282dfffdf1d3c450600baab5671b0a7a3010870ac219e744250fedca742d9fde8b510b454730d4c4cbfa876502
 
 pkgname = ardour
 	depends = cairo
diff --git a/PKGBUILD b/PKGBUILD
index 0e14b1a..16a1a5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=ardour
-pkgver=8.1
-_commit=9138fb9913f6ead7516ac58d24ca81c795c225b9  # refs/tags/8.1^{}
+pkgver=8.2
+_commit=92d6cb993391a37dcf3bd494707117ed63a4e7c4  # refs/tags/8.2^{}
 pkgrel=1
 pkgdesc="Professional-grade digital audio workstation"
 arch=(x86_64)
@@ -73,7 +73,8 @@ makedepends=(
   suil
   unzip
   vamp-plugin-sdk
-  waf)
+  waf
+)
 optdepends=(
   'harvid: for video timeline and MP3 export'
   'new-session-manager: for session management'
@@ -90,14 +91,17 @@ 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.2-revendor_libaaf.patch
 )
 noextract=($pkgname-midi-$pkgver.zip)
 sha512sums=('SKIP'
             '94b681f989e834f5de25ce87da9c174b11d90617063f8c96147d7eb470391b35f6d54b85de16da8d963cacb01b50d1c1fab0fddd18eb3b086fe17124ecfa4f65'
-            'a3da14925bc25d8a57ba3e137c4b2b04010054667ac4ae2aec116ce6c157b03c9dd76bf4d73c313022282362d19b91683f062d6ab2ee0c73a576d3fa6272bd1d')
+            'a3da14925bc25d8a57ba3e137c4b2b04010054667ac4ae2aec116ce6c157b03c9dd76bf4d73c313022282362d19b91683f062d6ab2ee0c73a576d3fa6272bd1d'
+            '29e5ded8860f09ab477b2e198175e2efac406799a5de6711944c23cf6e8940d56d94120dae57d42cb57baf5cffbd2c880340655722a7f31c6a2ac3b81fac73ed')
 b2sums=('SKIP'
         'e31be6b51a217e2f7f799aa1d6e8c3cd024d80ab2d8d4371496a2b8bf0215749979217b565909841a346d6b3128fbfd674d2fae64b9fe741a5b418cd184c23be'
-        '73845adce9a48938cd7aef5fbc65f492e470de316620d278365d247c80caef44531e850fbd3d2f5de65a8562e67aabfd982c938439bd3670726a27bc003be017')
+        '73845adce9a48938cd7aef5fbc65f492e470de316620d278365d247c80caef44531e850fbd3d2f5de65a8562e67aabfd982c938439bd3670726a27bc003be017'
+        'b3c1257d26eb89193b255c773b6a19de247056282dfffdf1d3c450600baab5671b0a7a3010870ac219e744250fedca742d9fde8b510b454730d4c4cbfa876502')
 
 pkgver() {
   cd $pkgname
@@ -108,6 +112,9 @@ 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
 
+  # use vendored libaaf, as upstream is completely out-of-sync and would require a lot of patching on both sides
+  patch -Np1 -d $pkgname -i ../$pkgname-8.2-revendor_libaaf.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.2-revendor_libaaf.patch b/ardour-8.2-revendor_libaaf.patch
new file mode 100644
index 0000000..56ed476
--- /dev/null
+++ b/ardour-8.2-revendor_libaaf.patch
@@ -0,0 +1,35 @@
+diff --git i/libs/aaf/wscript w/libs/aaf/wscript
+index 5ca7958a17..a43d94f8e4 100644
+--- i/libs/aaf/wscript
++++ w/libs/aaf/wscript
+@@ -37,13 +37,9 @@ def options(opt):
+     autowaf.set_options(opt)
+ 
+ def configure(conf):
+-    if conf.is_defined('USE_EXTERNAL_LIBS'):
+-        autowaf.check_pkg(conf, 'aaf', uselib_store='LIBAAF', mandatory=True)
++    return
+ 
+ def build(bld):
+-    if bld.is_defined('USE_EXTERNAL_LIBS'):
+-        return
+-
+     if bld.is_defined ('INTERNAL_SHARED_LIBS'):
+         obj              = bld.shlib(features = 'c cshlib', source=libaaf_sources)
+         obj.defines = [ 'LIBAAF_DLL_EXPORTS=1' ]
+diff --git i/session_utils/wscript w/session_utils/wscript
+index b7f6ef2b19..d4120a47b0 100644
+--- i/session_utils/wscript
++++ w/session_utils/wscript
+@@ -45,10 +45,7 @@ def build_ardour_util(bld, util):
+     obj.uselib       += ' FFTW3F LO TAGLIB LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK'
+ 
+     if util == "new_aaf_session":
+-        if bld.is_defined('USE_EXTERNAL_LIBS'):
+-            obj.uselib += ' LIBAAF'
+-        else:
+-            obj.use.extend (['libaaf'])
++        obj.use.extend (['libaaf'])
+ 
+     if bld.is_defined('HAVE_SUIL'):
+         obj.uselib += ' SUIL'