diff options
| author | Christopher Arndt | 2022-01-31 19:06:45 +0100 |
|---|---|---|
| committer | Christopher Arndt | 2022-01-31 19:06:45 +0100 |
| commit | e799f8319e98f12cc99e10c779ef299c9bf07128 (patch) | |
| tree | ef647e9339f5a1aca82226e7b3ad938378427862 | |
| parent | 40dc6e85e5b431adda55362a2d0e31b64c875fc1 (diff) | |
| download | aur-e799f8319e98f12cc99e10c779ef299c9bf07128.tar.gz | |
Fix wscript patch
Remove cwiid support causing too much trouble
Signed-off-by: Christopher Arndt <chris@chrisarndt.de>
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | ardour-6.2-vendor_qm-dsp.patch | 28 |
3 files changed, 16 insertions, 23 deletions
@@ -1,6 +1,6 @@ pkgbase = ardour-git pkgdesc = A multichannel hard disk recorder and digital audio workstation (git version) - pkgver = 6.3.r55.ga4b1277f85 + pkgver = 7.0.pre0.r2002.g866ba8b174 pkgrel = 1 url = https://ardour.org/ arch = x86_64 @@ -11,7 +11,6 @@ pkgbase = ardour-git makedepends = boost makedepends = cppunit makedepends = curl - makedepends = cwiid makedepends = dbus makedepends = doxygen makedepends = fftw @@ -58,7 +57,6 @@ pkgbase = ardour-git depends = pangomm depends = soundtouch depends = taglib - optdepends = cwiid: Wiimote control support optdepends = harvid: video timeline optdepends = libwebsockets: WebSockets control support optdepends = non-session-manager: for session management @@ -68,7 +66,7 @@ pkgbase = ardour-git source = ardour::git+https://github.com/Ardour/ardour.git source = ardour-6.2-vendor_qm-dsp.patch sha256sums = SKIP - sha256sums = e937d80e05fd2955b537b617793c06df23804406b5af7283821ad654fa646635 + sha256sums = 304abc95386889aaa878ea1e57233ab08d3d22a8034a7b5bb3d23aad23a8884b pkgname = ardour-git depends = atkmm @@ -122,4 +120,3 @@ pkgname = ardour-git depends = libusb-1.0.so depends = libvamp-hostsdk.so depends = libvamp-sdk.so - @@ -6,7 +6,7 @@ # Contributor: Christopher Arndt <aur at chrisarndt.de> pkgname=ardour-git -pkgver=6.3.r55.ga4b1277f85 +pkgver=7.0.pre0.r2002.g866ba8b174 pkgrel=1 pkgdesc="A multichannel hard disk recorder and digital audio workstation (git version)" arch=('x86_64') @@ -31,7 +31,7 @@ conflicts=('ardour') source=("${pkgname%-*}::git+https://github.com/Ardour/ardour.git" 'ardour-6.2-vendor_qm-dsp.patch') sha256sums=('SKIP' - 'e937d80e05fd2955b537b617793c06df23804406b5af7283821ad654fa646635') + '304abc95386889aaa878ea1e57233ab08d3d22a8034a7b5bb3d23aad23a8884b') pkgver() { cd "${srcdir}/${pkgname%-*}" diff --git a/ardour-6.2-vendor_qm-dsp.patch b/ardour-6.2-vendor_qm-dsp.patch index f8265fd6e484..b6dd884781e3 100644 --- a/ardour-6.2-vendor_qm-dsp.patch +++ b/ardour-6.2-vendor_qm-dsp.patch @@ -1,19 +1,15 @@ -diff --git i/libs/qm-dsp/wscript w/libs/qm-dsp/wscript -index 775098e06b..13f6b9410a 100644 ---- i/libs/qm-dsp/wscript -+++ w/libs/qm-dsp/wscript -@@ -23,17 +23,10 @@ def options(opt): +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) +- 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) -- else: -- conf.load('compiler_cxx') -- autowaf.configure(conf) -+ conf.load('compiler_cxx') -+ autowaf.configure(conf) ++ pass def build(bld): - if bld.is_defined('USE_EXTERNAL_LIBS'): @@ -22,11 +18,11 @@ index 775098e06b..13f6b9410a 100644 # Host Library obj = bld(features = 'c cxx cxxstlib') obj.source = ''' -diff --git i/wscript w/wscript -index 1c9bb1ff5d..95d377d8a7 100644 ---- i/wscript -+++ w/wscript -@@ -1041,8 +1041,6 @@ def configure(conf): +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) |