diff options
| -rw-r--r-- | audio/ardour/ardour.SlackBuild | 4 | ||||
| -rw-r--r-- | audio/ardour/ardour.info | 8 | ||||
| -rw-r--r-- | audio/ardour/vendor_qm-dsp.patch | 37 |
3 files changed, 44 insertions, 5 deletions
diff --git a/audio/ardour/ardour.SlackBuild b/audio/ardour/ardour.SlackBuild index 05afd738ada89..8727d9c894d58 100644 --- a/audio/ardour/ardour.SlackBuild +++ b/audio/ardour/ardour.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ardour -VERSION=${VERSION:-6.0} +VERSION=${VERSION:-6.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -74,6 +74,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/vendor_qm-dsp.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./waf configure \ diff --git a/audio/ardour/ardour.info b/audio/ardour/ardour.info index 623e9feee4c00..073969d60addb 100644 --- a/audio/ardour/ardour.info +++ b/audio/ardour/ardour.info @@ -1,10 +1,10 @@ PRGNAM="ardour" -VERSION="6.0" +VERSION="6.2" HOMEPAGE="http://ardour.org" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/Ardour-6.0.tar.xz" -MD5SUM="431990c6de9b87bb8a19d8228e55dc4c" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/Ardour-6.2.tar.xz" +MD5SUM="450ac363a266a7eb0b3bbf10e8d74f26" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="aubio jack liblo liblrdf vamp-plugin-sdk rubberband cwiid lilv" +REQUIRES="aubio jack liblo liblrdf vamp-plugin-sdk rubberband suil cwiid lilv" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/audio/ardour/vendor_qm-dsp.patch b/audio/ardour/vendor_qm-dsp.patch new file mode 100644 index 0000000000000..f8265fd6e484d --- /dev/null +++ b/audio/ardour/vendor_qm-dsp.patch @@ -0,0 +1,37 @@ +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): + 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(lib="qm-dsp", uselib_store="QMDSP", mandatory=True) +- else: +- conf.load('compiler_cxx') +- autowaf.configure(conf) ++ conf.load('compiler_cxx') ++ autowaf.configure(conf) + + def build(bld): +- if bld.is_defined('USE_EXTERNAL_LIBS'): +- return +- + # 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): + + 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) |