From 8d20980524c34145b77d8ca3c983cbb347b694f4 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sun, 28 Apr 2024 10:25:35 +0200 Subject: audio/ardour: Updated for version 8.6.0. Signed-off-by: Matteo Bernardini Signed-off-by: Willy Sudiarto Raharjo --- audio/ardour/ardour.SlackBuild | 10 +++---- audio/ardour/ardour.info | 6 ++--- audio/ardour/libxml2-2.12-fix.patch | 53 ------------------------------------- audio/ardour/vendor_qm-dsp.patch | 37 -------------------------- 4 files changed, 6 insertions(+), 100 deletions(-) delete mode 100644 audio/ardour/libxml2-2.12-fix.patch delete mode 100644 audio/ardour/vendor_qm-dsp.patch diff --git a/audio/ardour/ardour.SlackBuild b/audio/ardour/ardour.SlackBuild index 63f72ba036..8dfad24c8d 100644 --- a/audio/ardour/ardour.SlackBuild +++ b/audio/ardour/ardour.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for ardour # Copyright 2008-2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2018-2023 Matteo Bernardini, Pisa, Italy +# Copyright 2018-2024 Matteo Bernardini, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ardour -VERSION=${VERSION:-8.1.0} +VERSION=${VERSION:-8.6.0} MAJVER=$(echo $VERSION | cut -d. -f1) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,9 +61,6 @@ else TARGET="$ARCH" fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$TARGET-$BUILD$TAG.$PKGTYPE" exit 0 @@ -88,8 +85,7 @@ 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 {} + -# Thanks to fourtysixandtwo for pointing at this upstream pull request! -patch -p1 < $CWD/libxml2-2.12-fix.patch +sed -i "s|env\ python|env\ python3|" waf wscript CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/audio/ardour/ardour.info b/audio/ardour/ardour.info index c68b2e5110..5a1196d197 100644 --- a/audio/ardour/ardour.info +++ b/audio/ardour/ardour.info @@ -1,8 +1,8 @@ PRGNAM="ardour" -VERSION="8.1.0" +VERSION="8.6.0" HOMEPAGE="http://ardour.org" -DOWNLOAD="https://ponce.cc/slackware/sources/repo/Ardour-8.1.0.tar.bz2" -MD5SUM="278d59f3343057124989acbbf67d7f15" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/Ardour-8.6.0.tar.bz2" +MD5SUM="b3f176e79f14988c7b42479214c15184" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="aubio jack liblo liblrdf rubberband suil cwiid lilv vst3sdk" diff --git a/audio/ardour/libxml2-2.12-fix.patch b/audio/ardour/libxml2-2.12-fix.patch deleted file mode 100644 index 00ebd0f4e2..0000000000 --- a/audio/ardour/libxml2-2.12-fix.patch +++ /dev/null @@ -1,53 +0,0 @@ -From e995daa37529715214c6c4a2587e4134aaaba02f Mon Sep 17 00:00:00 2001 -From: Nils Philippsen -Date: Fri, 17 Nov 2023 23:26:06 +0100 -Subject: [PATCH] Fix failure to build with libxml2 version 2.12 - -This declared some xmlError pointers const, which probably was always -assumed, but not made explicit. - -Signed-off-by: Nils Philippsen ---- - gtk2_ardour/ardour_ui.cc | 8 ++++++-- - libs/pbd/xml++.cc | 2 +- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc -index 54ed79ea83d..77ddbbe99ca 100644 ---- a/gtk2_ardour/ardour_ui.cc -+++ b/gtk2_ardour/ardour_ui.cc -@@ -255,7 +255,7 @@ libxml_generic_error_func (void* /* parsing_context*/, - - static void - libxml_structured_error_func (void* /* parsing_context*/, -- xmlErrorPtr err) -+ const xmlError *err) - { - string msg; - -@@ -403,7 +403,11 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) - /* stop libxml from spewing to stdout/stderr */ - - xmlSetGenericErrorFunc (this, libxml_generic_error_func); -- xmlSetStructuredErrorFunc (this, libxml_structured_error_func); -+ -+ /* Cast to xmlStructuredErrorFunc to cope with different constness in different -+ * versions of libxml2. */ -+ -+ xmlSetStructuredErrorFunc (this, (xmlStructuredErrorFunc)libxml_structured_error_func); - - /* Set this up early */ - -diff --git a/libs/pbd/xml++.cc b/libs/pbd/xml++.cc -index 5c57ad8395d..1f5a85772f6 100644 ---- a/libs/pbd/xml++.cc -+++ b/libs/pbd/xml++.cc -@@ -170,7 +170,7 @@ XMLTree::write() const - result = xmlSaveFormatFileEnc(_filename.c_str(), doc, "UTF-8", 1); - #ifndef NDEBUG - if (result == -1) { -- xmlErrorPtr xerr = xmlGetLastError (); -+ const xmlError *xerr = xmlGetLastError (); - if (!xerr) { - std::cerr << "unknown XML error during xmlSaveFormatFileEnc()." << std::endl; - } else { diff --git a/audio/ardour/vendor_qm-dsp.patch b/audio/ardour/vendor_qm-dsp.patch deleted file mode 100644 index f8265fd6e4..0000000000 --- a/audio/ardour/vendor_qm-dsp.patch +++ /dev/null @@ -1,37 +0,0 @@ -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) -- cgit v1.2.3