Update qm-dsp wscript patch

Signed-off-by: Christopher Arndt <chris@chrisarndt.de>

4 files changed, 50 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 675a07d42b59..8b8d60d539d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ardour-git
 	pkgdesc = A multichannel hard disk recorder and digital audio workstation (git version)
-	pkgver = 7.0.pre0.r2002.g866ba8b174
+	pkgver = 7.0.pre0.r2972.gd037dff213
 	pkgrel = 1
 	url = https://ardour.org/
 	arch = x86_64
@@ -64,9 +64,9 @@ pkgbase = ardour-git
 	provides = ardour
 	conflicts = ardour
 	source = ardour::git+https://github.com/Ardour/ardour.git
-	source = ardour-6.2-vendor_qm-dsp.patch
+	source = ardour-7.x-vendor_qm-dsp.patch
 	sha256sums = SKIP
-	sha256sums = 304abc95386889aaa878ea1e57233ab08d3d22a8034a7b5bb3d23aad23a8884b
+	sha256sums = 6393d52d2c084e03ba24f657352a76a58d5e9f530cfeecb87babf8990c902cbc
 
 pkgname = ardour-git
 	depends = atkmm
diff --git a/PKGBUILD b/PKGBUILD
index 03e2191d770a..1f509615f83c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
-# Maintainer: Gimmeapill <gimmeapill at gmail.com>
+# Maintainer: Christopher Arndt <aur at chrisarndt.de>
+# Contributor: Gimmeapill <gimmeapill at gmail.com>
 # Contributor: Boohbah <boohbah at gmail.com>
 # Contributor: SpepS <dreamspepser at yahoo.it>
 # Contributor: Bernardo Barros <bernardobarros at gmail.com>
 # Contributor: Uli Armbruster <uli_armbruster at web.de>
-# Contributor: Christopher Arndt <aur at chrisarndt.de>
 
 pkgname=ardour-git
-pkgver=7.0.pre0.r2002.g866ba8b174
+pkgver=7.0.pre0.r2972.gd037dff213
 pkgrel=1
 pkgdesc="A multichannel hard disk recorder and digital audio workstation (git version)"
 arch=('x86_64')
@@ -29,9 +29,9 @@ optdepends=('harvid: video timeline'
 provides=('ardour')
 conflicts=('ardour')
 source=("${pkgname%-*}::git+https://github.com/Ardour/ardour.git"
-        'ardour-6.2-vendor_qm-dsp.patch')
+        'ardour-7.x-vendor_qm-dsp.patch')
 sha256sums=('SKIP'
-            '304abc95386889aaa878ea1e57233ab08d3d22a8034a7b5bb3d23aad23a8884b')
+            '6393d52d2c084e03ba24f657352a76a58d5e9f530cfeecb87babf8990c902cbc')
 
 pkgver() {
   cd "${srcdir}/${pkgname%-*}"
@@ -42,10 +42,7 @@ prepare() {
   cd "${srcdir}/${pkgname%-*}"
 
   # using vendored version of qm-dsp because qm-dsp >= 1.8.0 is not compatible
-  patch -Np1 -i "${srcdir}/ardour-6.2-vendor_qm-dsp.patch"
-
-  #~# Set icon for .adour files
-  #~patch -Np1 -i "${srcdir}/ardour-mime-icon.patch"
+  patch -Np1 -r - -i "$srcdir"/ardour-7.x-vendor_qm-dsp.patch
 
   # https://bugs.archlinux.org/task/54389
   sed -e '8iexport GTK2_RC_FILES=/dev/null' -i gtk2_ardour/ardour.sh.in
@@ -54,18 +51,18 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname%-*}"
 
-  python waf configure  --prefix=/usr \
-                        --configdir=/etc \
-                        --cxx11 \
-                        --freedesktop \
-                        --libjack=weak \
-                        --nls \
-                        --no-phone-home \
-                        --optimize \
-                        --ptformat \
-                        --use-external-libs \
-                        --with-backends=alsa,dummy,jack,pulseaudio
-
+  python waf configure \
+    --prefix=/usr \
+    --configdir=/etc \
+    --cxx11 \
+    --freedesktop \
+    --libjack=weak \
+    --nls \
+    --no-phone-home \
+    --optimize \
+    --ptformat \
+    --use-external-libs \
+    --with-backends=alsa,dummy,jack,pulseaudio
   python waf build $MAKEFLAGS
 }
 
@@ -87,13 +84,15 @@ package() {
   python waf --destdir="${pkgdir}" i18n
   python waf --destdir="${pkgdir}" install
 
-  # XDG integration
+  # Install XDG integration
   # File types
   install -vDm 644 "build/gtk2_${pkgname%-*}/${pkgname%-*}.xml" \
     -t "${pkgdir}/usr/share/mime/packages/"
-  # Install freedesktop.org compatible application starter desktop file
+
+  # application starter desktop file
   install -vDm644 "build/gtk2_${pkgname%-*}/${pkgname%-*}${pkgver%%.*}.desktop" \
     "${pkgdir}/usr/share/applications/ardour.desktop"
+
   # Icons
   for size in 16 22 32 48; do
     install -vdm 755 "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/mimetypes"
@@ -105,6 +104,7 @@ package() {
     ln -sf "/usr/share/ardour6/resources/Ardour-icon_${size}px.png" \
       "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${pkgname%-*}${pkgver%%.*}.png"
   done
-  # man pages
+
+  # Man pages
   install -vDm 644 "${pkgname%-*}.1"* -t "${pkgdir}/usr/share/man/man1/"
 }
diff --git a/ardour-6.2-vendor_qm-dsp.patch b/ardour-6.2-vendor_qm-dsp.patch
deleted file mode 100644
index b6dd884781e3..000000000000
--- a/ardour-6.2-vendor_qm-dsp.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript
-index 51ff966fc1..a95b62dca7 100644
---- a/libs/qm-dsp/wscript
-+++ b/libs/qm-dsp/wscript
-@@ -23,14 +23,9 @@ def options(opt):
-     autowaf.set_options(opt)
- 
- def configure(conf):
--    if conf.is_defined('USE_EXTERNAL_LIBS'):
--        conf.check_cxx(header_name="base/Pitch.h", mandatory=True, msg="Checking for qm-dsp headers")
--        conf.check_cxx(lib="qm-dsp", uselib_store="QMDSP", mandatory=True)
-+    pass
- 
- def build(bld):
--    if bld.is_defined('USE_EXTERNAL_LIBS'):
--        return
--
-     # Host Library
-     obj = bld(features = 'c cxx cxxstlib')
-     obj.source = '''
-diff --git a/wscript b/wscript
-index 6488749633..53a73c9ac6 100644
---- a/wscript
-+++ b/wscript
-@@ -1103,8 +1103,6 @@ def configure(conf):
- 
-     if Options.options.use_external_libs:
-         conf.define('USE_EXTERNAL_LIBS', 1)
--        conf.env.append_value(
--            'CXXFLAGS', '-I' + Options.options.qm_dsp_include)
- 
-     if Options.options.boost_include != '':
-         conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include)
diff --git a/ardour-7.x-vendor_qm-dsp.patch b/ardour-7.x-vendor_qm-dsp.patch
new file mode 100644
index 000000000000..d3ec118aa05c
--- /dev/null
+++ b/ardour-7.x-vendor_qm-dsp.patch
@@ -0,0 +1,23 @@
+diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript
+index a59801bf36..be443829b3 100644
+--- a/libs/qm-dsp/wscript
++++ b/libs/qm-dsp/wscript
+@@ -23,7 +23,7 @@ def options(opt):
+     autowaf.set_options(opt)
+ 
+ def configure(conf):
+-    if conf.is_defined('USE_EXTERNAL_LIBS'):
++    if False:
+         conf.check_cxx(header_name="base/Pitch.h", mandatory=True, msg="Checking for qm-dsp headers")
+         conf.check_cxx(lib="qm-dsp", uselib_store="QMDSP", mandatory=True)
+ 
+@@ -51,9 +51,6 @@ def configure(conf):
+                            )
+ 
+ def build(bld):
+-    if bld.is_defined('USE_EXTERNAL_LIBS'):
+-        return
+-
+     # Host Library
+     obj = bld(features = 'c cxx cxxstlib')
+     obj.source = '''