| author | David Runge
<dvzrv@archlinux.org> 2024-02-20 17:35:32 UTC |
| committer | David Runge
<dvzrv@archlinux.org> 2024-02-20 17:35:32 UTC |
| parent | 7ffb0728c4aebe88572ae5568aae104cb55966a7 |
| .SRCINFO | +18 | -25 |
| PKGBUILD | +18 | -19 |
| ardour-8.2-revendor_libaaf.patch | +0 | -35 |
| ardour-8.3-aaflib.patch | +13 | -0 |
| ardour-8.3-iostream_taglib2.patch | +26 | -0 |
diff --git a/.SRCINFO b/.SRCINFO index 9d088b1..3bc53e5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = ardour pkgdesc = Professional-grade digital audio workstation - pkgver = 8.2 - pkgrel = 3 + pkgver = 8.3 + pkgrel = 1 url = https://ardour.org/ arch = x86_64 groups = pro-audio @@ -9,7 +9,6 @@ pkgbase = ardour license = GPL-2.0-or-later license = GPL-3.0-or-later license = MIT - makedepends = atkmm makedepends = aubio makedepends = boost makedepends = cairomm @@ -22,12 +21,10 @@ pkgbase = ardour makedepends = fluidsynth makedepends = fontconfig makedepends = freetype2 - makedepends = gdk-pixbuf2 makedepends = git makedepends = glib2 makedepends = glibmm makedepends = graphviz - makedepends = gtk2 makedepends = hidapi makedepends = itstool makedepends = jack @@ -36,6 +33,7 @@ pkgbase = ardour makedepends = liblrdf makedepends = libltc makedepends = libogg + makedepends = libpng makedepends = libpulse makedepends = libsamplerate makedepends = libsndfile @@ -51,19 +49,18 @@ pkgbase = ardour makedepends = serd makedepends = sord makedepends = sratom - makedepends = suil makedepends = unzip makedepends = vamp-plugin-sdk makedepends = waf depends = cairo depends = gcc-libs depends = glibc - depends = gtkmm depends = hicolor-icon-theme depends = libsigc++ depends = libx11 + depends = libxext depends = sh - depends = taglib1 + depends = taglib optdepends = harvid: for video timeline and MP3 export optdepends = new-session-manager: for session management optdepends = xjadeo: for video monitoring @@ -72,34 +69,35 @@ pkgbase = ardour provides = vamp-host provides = vst-host provides = vst3-host - noextract = ardour-midi-8.2.zip - source = ardour::git+https://github.com/ardour/ardour.git#tag=92d6cb993391a37dcf3bd494707117ed63a4e7c4 - source = ardour-midi-8.2.zip::http://stuff.ardour.org/loops/ArdourBundledMedia.zip + noextract = ardour-midi-8.3.zip + source = ardour::git+https://github.com/ardour/ardour.git#tag=6d34500e8da820ad257ee6009bfd8e7c3335d648 + source = ardour-midi-8.3.zip::http://stuff.ardour.org/loops/ArdourBundledMedia.zip source = ardour-7.0-re-vendor_qm-dsp.patch - source = ardour-8.2-revendor_libaaf.patch + source = ardour-8.3-aaflib.patch + source = ardour-8.3-iostream_taglib2.patch sha512sums = SKIP sha512sums = 94b681f989e834f5de25ce87da9c174b11d90617063f8c96147d7eb470391b35f6d54b85de16da8d963cacb01b50d1c1fab0fddd18eb3b086fe17124ecfa4f65 sha512sums = a3da14925bc25d8a57ba3e137c4b2b04010054667ac4ae2aec116ce6c157b03c9dd76bf4d73c313022282362d19b91683f062d6ab2ee0c73a576d3fa6272bd1d - sha512sums = 29e5ded8860f09ab477b2e198175e2efac406799a5de6711944c23cf6e8940d56d94120dae57d42cb57baf5cffbd2c880340655722a7f31c6a2ac3b81fac73ed + sha512sums = c1b43bc694b306ffdbe3e5161bee0d1e0c8033ffdf1b9c4e9a0c2903e4ec9b09dd30719d08cdeac061fba985f20ca61ade5abb3d9fa0f0bcbd0399ebdcd67a79 + sha512sums = 1cbdd0bc0d7d896c045f2253841703f8bc88295540be03a5ed4094c8ed1cb3cddc62e983a6bf3ef7290fd67fa0e8b13220fae6e9af87acf36cf9334f17cfcabe b2sums = SKIP b2sums = e31be6b51a217e2f7f799aa1d6e8c3cd024d80ab2d8d4371496a2b8bf0215749979217b565909841a346d6b3128fbfd674d2fae64b9fe741a5b418cd184c23be b2sums = 73845adce9a48938cd7aef5fbc65f492e470de316620d278365d247c80caef44531e850fbd3d2f5de65a8562e67aabfd982c938439bd3670726a27bc003be017 - b2sums = b3c1257d26eb89193b255c773b6a19de247056282dfffdf1d3c450600baab5671b0a7a3010870ac219e744250fedca742d9fde8b510b454730d4c4cbfa876502 + b2sums = 824d66a6665e0c4d06f55448cafd61fa8aa376771d636cb8251baae0d3592baefff0c16a9c12fc0b9ea42f15e90928054423e77f8641f8232be64c71484261be + b2sums = 15efbb85a0fe275c094c1ed3f47311d51147b65e39c4369cdbe087cf68ee3dab5ecc92efe8a177b51ab8bf77b507de4209239efa88a135b0b1687fc46618febe pkgname = ardour depends = cairo depends = gcc-libs depends = glibc - depends = gtkmm depends = hicolor-icon-theme depends = libsigc++ depends = libx11 + depends = libxext depends = sh - depends = taglib1 + depends = taglib depends = alsa-lib depends = libasound.so - depends = atkmm - depends = libatkmm-1.6.so depends = aubio depends = libaubio.so depends = cairomm @@ -115,16 +113,11 @@ pkgname = ardour depends = libfluidsynth.so depends = fontconfig depends = libfontconfig.so - depends = gdk-pixbuf2 - depends = libgdk_pixbuf-2.0.so depends = glib2 depends = libglib-2.0.so depends = libgobject-2.0.so depends = glibmm depends = libglibmm-2.4.so - depends = gtk2 - depends = libgdk-x11-2.0.so - depends = libgtk-x11-2.0.so depends = jack depends = libjack.so depends = libarchive @@ -137,6 +130,8 @@ pkgname = ardour depends = liblrdf.so depends = libltc depends = libltc.so + depends = libpng + depends = libpng16.so depends = libsamplerate depends = libsamplerate.so depends = libsndfile @@ -159,8 +154,6 @@ pkgname = ardour depends = libreadline.so depends = rubberband depends = librubberband.so - depends = suil - depends = libsuil-0.so depends = vamp-plugin-sdk depends = libvamp-hostsdk.so depends = libvamp-sdk.so diff --git a/PKGBUILD b/PKGBUILD index c647f20..a9eb4a3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,9 +3,9 @@ # Contributor: SpepS <dreamspepser at yahoo dot it> pkgname=ardour -pkgver=8.2 -_commit=92d6cb993391a37dcf3bd494707117ed63a4e7c4 # refs/tags/8.2^{} -pkgrel=3 +pkgver=8.3 +_commit=6d34500e8da820ad257ee6009bfd8e7c3335d648 # refs/tags/8.3^{} +pkgrel=1 pkgdesc="Professional-grade digital audio workstation" arch=(x86_64) url="https://ardour.org/" @@ -20,15 +20,14 @@ depends=( cairo gcc-libs glibc - gtkmm hicolor-icon-theme libsigc++ libx11 + libxext sh - taglib1 + taglib ) makedepends=( - atkmm aubio boost cairomm @@ -41,12 +40,10 @@ makedepends=( fluidsynth fontconfig freetype2 - gdk-pixbuf2 git glib2 glibmm graphviz - gtk2 hidapi itstool jack @@ -55,6 +52,7 @@ makedepends=( liblrdf libltc libogg + libpng libpulse libsamplerate libsndfile @@ -70,7 +68,6 @@ makedepends=( serd sord sratom - suil unzip vamp-plugin-sdk waf @@ -91,17 +88,20 @@ source=( $pkgname::git+https://github.com/$pkgname/$pkgname.git#tag=$_commit $pkgname-midi-$pkgver.zip::http://stuff.ardour.org/loops/ArdourBundledMedia.zip $pkgname-7.0-re-vendor_qm-dsp.patch - $pkgname-8.2-revendor_libaaf.patch + $pkgname-8.3-aaflib.patch + $pkgname-8.3-iostream_taglib2.patch ) noextract=($pkgname-midi-$pkgver.zip) sha512sums=('SKIP' '94b681f989e834f5de25ce87da9c174b11d90617063f8c96147d7eb470391b35f6d54b85de16da8d963cacb01b50d1c1fab0fddd18eb3b086fe17124ecfa4f65' 'a3da14925bc25d8a57ba3e137c4b2b04010054667ac4ae2aec116ce6c157b03c9dd76bf4d73c313022282362d19b91683f062d6ab2ee0c73a576d3fa6272bd1d' - '29e5ded8860f09ab477b2e198175e2efac406799a5de6711944c23cf6e8940d56d94120dae57d42cb57baf5cffbd2c880340655722a7f31c6a2ac3b81fac73ed') + 'c1b43bc694b306ffdbe3e5161bee0d1e0c8033ffdf1b9c4e9a0c2903e4ec9b09dd30719d08cdeac061fba985f20ca61ade5abb3d9fa0f0bcbd0399ebdcd67a79' + '1cbdd0bc0d7d896c045f2253841703f8bc88295540be03a5ed4094c8ed1cb3cddc62e983a6bf3ef7290fd67fa0e8b13220fae6e9af87acf36cf9334f17cfcabe') b2sums=('SKIP' 'e31be6b51a217e2f7f799aa1d6e8c3cd024d80ab2d8d4371496a2b8bf0215749979217b565909841a346d6b3128fbfd674d2fae64b9fe741a5b418cd184c23be' '73845adce9a48938cd7aef5fbc65f492e470de316620d278365d247c80caef44531e850fbd3d2f5de65a8562e67aabfd982c938439bd3670726a27bc003be017' - 'b3c1257d26eb89193b255c773b6a19de247056282dfffdf1d3c450600baab5671b0a7a3010870ac219e744250fedca742d9fde8b510b454730d4c4cbfa876502') + '824d66a6665e0c4d06f55448cafd61fa8aa376771d636cb8251baae0d3592baefff0c16a9c12fc0b9ea42f15e90928054423e77f8641f8232be64c71484261be' + '15efbb85a0fe275c094c1ed3f47311d51147b65e39c4369cdbe087cf68ee3dab5ecc92efe8a177b51ab8bf77b507de4209239efa88a135b0b1687fc46618febe') pkgver() { cd $pkgname @@ -112,8 +112,11 @@ prepare() { # using vendored version of qm-dsp because qm-dsp >= 1.8.0 is not compatible patch -Np1 -d $pkgname -i ../$pkgname-7.0-re-vendor_qm-dsp.patch - # use vendored libaaf, as upstream is completely out-of-sync and would require a lot of patching on both sides - patch -Np1 -d $pkgname -i ../$pkgname-8.2-revendor_libaaf.patch + # fix issue with include path when using --use-external-libs + patch -Np1 -d $pkgname -i ../$pkgname-8.3-aaflib.patch + + # add missing iostream include for taglib >= 2: https://github.com/Ardour/ardour/pull/868 + patch -Np1 -d $pkgname -i ../$pkgname-8.3-iostream_taglib2.patch cd $pkgname # unsetting gtk2 rc (FS#54389) @@ -148,7 +151,6 @@ build() { cd $pkgname export LINKFLAGS="$LDFLAGS" - export PKG_CONFIG_PATH=/usr/lib/taglib1/pkgconfig waf configure "${waf_configure_options[@]}" waf build -v } @@ -156,7 +158,6 @@ build() { package() { depends+=( alsa-lib libasound.so - atkmm libatkmm-1.6.so aubio libaubio.so cairomm libcairomm-1.0.so curl libcurl.so @@ -164,16 +165,15 @@ package() { fftw libfftw3f.so libfftw3f_threads.so fluidsynth libfluidsynth.so fontconfig libfontconfig.so - gdk-pixbuf2 libgdk_pixbuf-2.0.so glib2 libglib-2.0.so libgobject-2.0.so glibmm libglibmm-2.4.so - gtk2 libgdk-x11-2.0.so libgtk-x11-2.0.so jack libjack.so libarchive libarchive.so liblo liblo.so libpulse libpulse.so liblrdf liblrdf.so libltc libltc.so + libpng libpng16.so libsamplerate libsamplerate.so libsndfile libsndfile.so libusb libusb-1.0.so @@ -184,7 +184,6 @@ package() { pangomm libpangomm-1.4.so readline libreadline.so rubberband librubberband.so - suil libsuil-0.so vamp-plugin-sdk libvamp-hostsdk.so libvamp-sdk.so ) diff --git a/ardour-8.2-revendor_libaaf.patch b/ardour-8.2-revendor_libaaf.patch deleted file mode 100644 index 56ed476..0000000 --- a/ardour-8.2-revendor_libaaf.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git i/libs/aaf/wscript w/libs/aaf/wscript -index 5ca7958a17..a43d94f8e4 100644 ---- i/libs/aaf/wscript -+++ w/libs/aaf/wscript -@@ -37,13 +37,9 @@ def options(opt): - autowaf.set_options(opt) - - def configure(conf): -- if conf.is_defined('USE_EXTERNAL_LIBS'): -- autowaf.check_pkg(conf, 'aaf', uselib_store='LIBAAF', mandatory=True) -+ return - - def build(bld): -- if bld.is_defined('USE_EXTERNAL_LIBS'): -- return -- - if bld.is_defined ('INTERNAL_SHARED_LIBS'): - obj = bld.shlib(features = 'c cshlib', source=libaaf_sources) - obj.defines = [ 'LIBAAF_DLL_EXPORTS=1' ] -diff --git i/session_utils/wscript w/session_utils/wscript -index b7f6ef2b19..d4120a47b0 100644 ---- i/session_utils/wscript -+++ w/session_utils/wscript -@@ -45,10 +45,7 @@ def build_ardour_util(bld, util): - obj.uselib += ' FFTW3F LO TAGLIB LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK' - - if util == "new_aaf_session": -- if bld.is_defined('USE_EXTERNAL_LIBS'): -- obj.uselib += ' LIBAAF' -- else: -- obj.use.extend (['libaaf']) -+ obj.use.extend (['libaaf']) - - if bld.is_defined('HAVE_SUIL'): - obj.uselib += ' SUIL' diff --git a/ardour-8.3-aaflib.patch b/ardour-8.3-aaflib.patch new file mode 100644 index 0000000..8b37c4e --- /dev/null +++ b/ardour-8.3-aaflib.patch @@ -0,0 +1,13 @@ +diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript +index af43c82722..0869f99a23 100644 +--- a/gtk2_ardour/wscript ++++ b/gtk2_ardour/wscript +@@ -644,7 +644,7 @@ def build(bld): + else: + obj.uselib += ' GTKMM GTK' + +- if bld.is_defined('USE_EXTERNAL_LIBS'): ++ if False and bld.is_defined('USE_EXTERNAL_LIBS'): + obj.uselib += ' LIBAAF' + else: + obj.use.extend (['libaaf']) diff --git a/ardour-8.3-iostream_taglib2.patch b/ardour-8.3-iostream_taglib2.patch new file mode 100644 index 0000000..7246835 --- /dev/null +++ b/ardour-8.3-iostream_taglib2.patch @@ -0,0 +1,26 @@ +From f331ce72528a7cca35ede168d2fa26f9872a6e1e Mon Sep 17 00:00:00 2001 +From: David Runge <dave@sleepmap.de> +Date: Tue, 20 Feb 2024 16:38:37 +0100 +Subject: [PATCH] Add missing include for iostream, needed for taglib >= 2 + +Signed-off-by: David Runge <dave@sleepmap.de> +--- + libs/ardour/audiofile_tagger.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libs/ardour/audiofile_tagger.cc b/libs/ardour/audiofile_tagger.cc +index 4c132cbcc6..e744561346 100644 +--- a/libs/ardour/audiofile_tagger.cc ++++ b/libs/ardour/audiofile_tagger.cc +@@ -34,6 +34,8 @@ + #include <taglib/taglib.h> + #include <taglib/xiphcomment.h> + ++#include <iostream> ++ + /* Convert string to TagLib::String */ + #define TL_STR(string) TagLib::String ((string).c_str(), TagLib::String::UTF8) + +-- +2.43.2 +