diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/ardour/ardour.SlackBuild | 24 | ||||
| -rw-r--r-- | audio/ardour/ardour.info | 8 | ||||
| -rw-r--r-- | audio/ardour/libxml2-2.12-fix.patch | 53 |
3 files changed, 70 insertions, 15 deletions
diff --git a/audio/ardour/ardour.SlackBuild b/audio/ardour/ardour.SlackBuild index a7097f2213e7f..63f72ba036cc0 100644 --- a/audio/ardour/ardour.SlackBuild +++ b/audio/ardour/ardour.SlackBuild @@ -29,8 +29,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ardour -VERSION=${VERSION:-7.5.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-8.1.0} +MAJVER=$(echo $VERSION | cut -d. -f1) +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -87,6 +88,9 @@ 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 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./waf configure \ @@ -100,9 +104,7 @@ CXXFLAGS="$SLKCFLAGS" \ --optimize \ --freedesktop \ --no-phone-home \ - --nls \ - --ptformat \ - --lxvst + --ptformat ./waf build @@ -112,19 +114,19 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/share/{appdata,applications,icons} -cp build/gtk2_ardour/ardour7.appdata.xml $PKG/usr/share/appdata/ +cp build/gtk2_ardour/ardour$MAJVER.appdata.xml $PKG/usr/share/appdata/ # 20230703 bkw: desktop-file-validate complained about Categories. # The desktop menu spec: # https://specifications.freedesktop.org/menu-spec/latest/apa.html # ...has no such category as AudioEditing. -sed 's,AudioEditing;,X-&,' build/gtk2_ardour/ardour7.desktop \ - > $PKG/usr/share/applications/ardour7.desktop +sed 's,AudioEditing;,X-&,' build/gtk2_ardour/ardour$MAJVER.desktop \ + > $PKG/usr/share/applications/ardour$MAJVER.desktop for isize in 16 22 32 48 ; do mkdir -p $PKG/usr/share/icons/hicolor/${isize}x${isize}/apps cp gtk2_ardour/icons/application-x-ardour_${isize}px.png \ - $PKG/usr/share/icons/hicolor/${isize}x${isize}/apps/ardour7.png + $PKG/usr/share/icons/hicolor/${isize}x${isize}/apps/ardour$MAJVER.png done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION @@ -137,10 +139,10 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh # Let's not clobber config files -cd $PKG/etc/ardour7 +cd $PKG/etc/ardour$MAJVER for i in $(find . -type f) ; do mv $i $i.new - echo "config etc/ardour7/$i.new" >> $PKG/install/doinst.sh + echo "config etc/ardour$MAJVER/$i.new" >> $PKG/install/doinst.sh done cd - diff --git a/audio/ardour/ardour.info b/audio/ardour/ardour.info index 70c8d4edde134..4162454b8a0a2 100644 --- a/audio/ardour/ardour.info +++ b/audio/ardour/ardour.info @@ -1,10 +1,10 @@ PRGNAM="ardour" -VERSION="7.5.0" +VERSION="8.1.0" HOMEPAGE="http://ardour.org" -DOWNLOAD="https://ponce.cc/slackware/sources/repo/Ardour-7.5.0.tar.bz2" -MD5SUM="142531c818199ab8a6f89547fb1a2f1b" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/Ardour-8.1.0.tar.bz2" +MD5SUM="278d59f3343057124989acbbf67d7f15" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="aubio jack liblo liblrdf vamp-plugin-sdk rubberband suil cwiid lilv" +REQUIRES="aubio jack liblo liblrdf vamp-plugin-sdk rubberband suil cwiid lilv vst3sdk" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/audio/ardour/libxml2-2.12-fix.patch b/audio/ardour/libxml2-2.12-fix.patch new file mode 100644 index 0000000000000..00ebd0f4e223f --- /dev/null +++ b/audio/ardour/libxml2-2.12-fix.patch @@ -0,0 +1,53 @@ +From e995daa37529715214c6c4a2587e4134aaaba02f Mon Sep 17 00:00:00 2001 +From: Nils Philippsen <nils@tiptoe.de> +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 <nils@tiptoe.de> +--- + 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 { |