| author | David Runge
<dvzrv@archlinux.org> 2019-11-28 08:30:25 UTC |
| committer | David Runge
<dvzrv@archlinux.org> 2019-11-28 08:30:25 UTC |
| parent | 4ac6c053a0a303ee1d26c8ace2174952f25cb7d8 |
| PKGBUILD | +2 | -2 |
| ardour-5.12-waf-python3.patch | +165 | -2 |
diff --git a/PKGBUILD b/PKGBUILD index 17b8466..1c9ada0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ _name=Ardour pkgname=ardour pkgver=5.12 -pkgrel=12 +pkgrel=13 pkgdesc="Professional-grade digital audio workstation" arch=('x86_64') url="https://ardour.org/" @@ -24,7 +24,7 @@ source=("${pkgname}-${pkgver}::git+https://github.com/${pkgname}/${pkgname}.git# "${pkgname}-${pkgver}-waf-python3.patch" 'https://gitlab.com/ita1024/waf/raw/waf-1.6.11/waflib/extras/misc.py') sha512sums=('SKIP' - 'a716271681ae312b36d6b7e2c82ace91ca29d7ee579e14002fb5936e0708b0957ccb4f2da0e4d23068287585b8b20c633ed1e1807f30e0e06ca67c7de2a611d4' + 'fc6e4391c25e3dc159b4dfe714b5f75210f912444c63f7b59c6527eda0a4a62ac8946733d4c5391e20c1dafa42cb02b5629d5f12e66724b81019d7fc42dbca75' '71bd724dfce9f02d2635a4594ee28c85a467cacd7ea5a6bb0b3e431a8759b161ace021086c97e73923b98b41876407df6cce2b588a79e8f9fb4b3010afba962e') prepare() { diff --git a/ardour-5.12-waf-python3.patch b/ardour-5.12-waf-python3.patch index 036ffd5..5eac00e 100644 --- a/ardour-5.12-waf-python3.patch +++ b/ardour-5.12-waf-python3.patch @@ -12,6 +12,169 @@ index d3824a0a63..b8d92513bd 100644 if bld.is_defined('WINDOWS_VST_SUPPORT'): # Windows VST support mingw +diff --git c/libs/plugins/a-comp.lv2/wscript w/libs/plugins/a-comp.lv2/wscript +index f0ebb1d33d..affef9b4fa 100644 +--- c/libs/plugins/a-comp.lv2/wscript ++++ w/libs/plugins/a-comp.lv2/wscript +@@ -25,15 +25,15 @@ def build(bld): + module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) + module_ext = module_pat[module_pat.rfind('.'):] + +- if bld.is_defined ('HAVE_LV2'): ++ if bld.is_defined('HAVE_LV2'): + # Build RDF files + for i in ['manifest.ttl', 'a-comp.ttl', 'a-comp#stereo.ttl', 'presets.ttl']: +- bld(features = 'subst', +- source = i + '.in', +- target = '../../LV2/%s/%s' % (bundle, i), +- install_path = '${LV2DIR}/%s' % bundle, +- chmod = Utils.O644, +- LIB_EXT = module_ext) ++ obj = bld(features='subst') ++ obj.source = i + '.in' ++ obj.target = '../../LV2/%s/%s' % (bundle, i) ++ obj.install_path = '${LV2DIR}/%s' % bundle ++ obj.chmod = Utils.O644 ++ obj.dict = {'LIB_EXT': module_ext} + + # Build plugin library + obj = bld(features = 'c cshlib', +diff --git c/libs/plugins/a-delay.lv2/wscript w/libs/plugins/a-delay.lv2/wscript +index 666ef0d5ab..2af05ff137 100644 +--- c/libs/plugins/a-delay.lv2/wscript ++++ w/libs/plugins/a-delay.lv2/wscript +@@ -25,15 +25,15 @@ def build(bld): + module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) + module_ext = module_pat[module_pat.rfind('.'):] + +- if bld.is_defined ('HAVE_LV2'): ++ if bld.is_defined('HAVE_LV2'): + # Build RDF files + for i in ['manifest.ttl', 'a-delay.ttl', 'presets.ttl']: +- bld(features = 'subst', +- source = i + '.in', +- target = '../../LV2/%s/%s' % (bundle, i), +- install_path = '${LV2DIR}/%s' % bundle, +- chmod = Utils.O644, +- LIB_EXT = module_ext) ++ obj = bld(features='subst') ++ obj.source = i + '.in' ++ obj.target = '../../LV2/%s/%s' % (bundle, i) ++ obj.install_path = '${LV2DIR}/%s' % bundle ++ obj.chmod = Utils.O644 ++ obj.dict = {'LIB_EXT': module_ext} + + # Build plugin library + obj = bld(features = 'c cshlib', +diff --git c/libs/plugins/a-eq.lv2/wscript w/libs/plugins/a-eq.lv2/wscript +index 0610ba2eea..e36a804f7f 100644 +--- c/libs/plugins/a-eq.lv2/wscript ++++ w/libs/plugins/a-eq.lv2/wscript +@@ -25,15 +25,15 @@ def build(bld): + module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) + module_ext = module_pat[module_pat.rfind('.'):] + +- if bld.is_defined ('HAVE_LV2'): ++ if bld.is_defined('HAVE_LV2'): + # Build RDF files + for i in ['manifest.ttl', 'a-eq.ttl']: +- bld(features = 'subst', +- source = i + '.in', +- target = '../../LV2/%s/%s' % (bundle, i), +- install_path = '${LV2DIR}/%s' % bundle, +- chmod = Utils.O644, +- LIB_EXT = module_ext) ++ obj = bld(features='subst') ++ obj.source = i + '.in' ++ obj.target = '../../LV2/%s/%s' % (bundle, i) ++ obj.install_path = '${LV2DIR}/%s' % bundle ++ obj.chmod = Utils.O644 ++ obj.dict = {'LIB_EXT': module_ext} + + # Build plugin library + obj = bld(features = 'c cshlib', +diff --git c/libs/plugins/a-fluidsynth.lv2/wscript w/libs/plugins/a-fluidsynth.lv2/wscript +index af6fcf08a8..81e59adeac 100644 +--- c/libs/plugins/a-fluidsynth.lv2/wscript ++++ w/libs/plugins/a-fluidsynth.lv2/wscript +@@ -24,15 +24,15 @@ def build(bld): + module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) + module_ext = module_pat[module_pat.rfind('.'):] + +- if bld.is_defined ('HAVE_LV2'): ++ if bld.is_defined('HAVE_LV2'): + # Build RDF files + for i in ['manifest.ttl', 'a-fluidsynth.ttl']: +- bld(features = 'subst', +- source = i + '.in', +- target = '../../LV2/%s/%s' % (bundle, i), +- install_path = '${LV2DIR}/%s' % bundle, +- chmod = Utils.O644, +- LIB_EXT = module_ext) ++ obj = bld(features='subst') ++ obj.source = i + '.in' ++ obj.target = '../../LV2/%s/%s' % (bundle, i) ++ obj.install_path = '${LV2DIR}/%s' % bundle ++ obj.chmod = Utils.O644 ++ obj.dict = {'LIB_EXT': module_ext} + + # Build plugin library + obj = bld(features = 'cxx cshlib', +diff --git c/libs/plugins/a-reverb.lv2/wscript w/libs/plugins/a-reverb.lv2/wscript +index 35601f2179..adc1b2a4ea 100644 +--- c/libs/plugins/a-reverb.lv2/wscript ++++ w/libs/plugins/a-reverb.lv2/wscript +@@ -24,15 +24,15 @@ def build(bld): + module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) + module_ext = module_pat[module_pat.rfind('.'):] + +- if bld.is_defined ('HAVE_LV2'): +- # Build RDF files ++ if bld.is_defined('HAVE_LV2'): ++ # Build RDF fles + for i in ['manifest.ttl', 'a-reverb.ttl']: +- bld(features = 'subst', +- source = i + '.in', +- target = '../../LV2/%s/%s' % (bundle, i), +- install_path = '${LV2DIR}/%s' % bundle, +- chmod = Utils.O644, +- LIB_EXT = module_ext) ++ obj = bld(features='subst') ++ obj.source = i + '.in' ++ obj.target = '../../LV2/%s/%s' % (bundle, i) ++ obj.install_path = '${LV2DIR}/%s' % bundle ++ obj.chmod = Utils.O644 ++ obj.dict = {'LIB_EXT': module_ext} + + # Build plugin library + obj = bld(features = 'c cshlib', +diff --git c/libs/plugins/reasonablesynth.lv2/wscript w/libs/plugins/reasonablesynth.lv2/wscript +index cedda4c308..0eb5c55a04 100644 +--- c/libs/plugins/reasonablesynth.lv2/wscript ++++ w/libs/plugins/reasonablesynth.lv2/wscript +@@ -24,15 +24,15 @@ def build(bld): + module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN) + module_ext = module_pat[module_pat.rfind('.'):] + +- if bld.is_defined ('HAVE_LV2'): ++ if bld.is_defined('HAVE_LV2'): + # Build RDF files + for i in ['manifest.ttl', 'reasonablesynth.ttl']: +- bld(features = 'subst', +- source = i + '.in', +- target = '../../LV2/%s/%s' % (bundle, i), +- install_path = '${LV2DIR}/%s' % bundle, +- chmod = Utils.O644, +- LIB_EXT = module_ext) ++ obj = bld(features='subst') ++ obj.source = i + '.in' ++ obj.target = '../../LV2/%s/%s' % (bundle, i) ++ obj.install_path = '${LV2DIR}/%s' % bundle ++ obj.chmod = Utils.O644 ++ obj.dict = {'LIB_EXT': module_ext} + + # Build plugin library + obj = bld(features = 'c cshlib', diff --git c/libs/ptformat/wscript w/libs/ptformat/wscript index 4d381234fe..ad3370d19b 100644 --- c/libs/ptformat/wscript @@ -67,7 +230,7 @@ index 0559abe4dc..6e7ca29fc6 100644 obj.target = 'widgets' obj.vnum = WIDGETS_LIB_VERSION diff --git c/session_utils/wscript w/session_utils/wscript -index 5fe9445426..249796d132 100644 +index 5fe9445426..a98694f3d6 100644 --- c/session_utils/wscript +++ w/session_utils/wscript @@ -86,7 +86,7 @@ def build(bld): @@ -75,7 +238,7 @@ index 5fe9445426..249796d132 100644 for util in utils: - fn = str(util)[:-3] -+ fn = os.path.basename(str(util))[:-3] ++ fn = os.path.splitext(os.path.basename(str(util)))[0] build_ardour_util(bld, fn) if bld.env['build_target'] != 'mingw': bld.symlink_as(bld.env['BINDIR'] + '/' + pgmprefix + "-" + fn, bld.env['LIBDIR'] + '/utils/ardour-util.sh')