Date: Wednesday, December 29, 2021 @ 13:08:06 Author: dvzrv Revision: 1087161
archrelease: copy trunk to community-x86_64 Added: marsyas/repos/community-x86_64/PKGBUILD (from rev 1087160, marsyas/trunk/PKGBUILD) marsyas/repos/community-x86_64/marsyas-0.5.0-pd_extension.patch (from rev 1087160, marsyas/trunk/marsyas-0.5.0-pd_extension.patch) marsyas/repos/community-x86_64/marsyas-0.5.0-qpainterpath.patch (from rev 1087160, marsyas/trunk/marsyas-0.5.0-qpainterpath.patch) marsyas/repos/community-x86_64/marsyas-0.5.0-vamp_include_dirs.patch (from rev 1087160, marsyas/trunk/marsyas-0.5.0-vamp_include_dirs.patch) Deleted: marsyas/repos/community-x86_64/PKGBUILD marsyas/repos/community-x86_64/marsyas-0.5.0-pd_extension.patch marsyas/repos/community-x86_64/marsyas-0.5.0-qpainterpath.patch marsyas/repos/community-x86_64/marsyas-0.5.0-vamp_include_dirs.patch ---------------------------------------+ PKGBUILD | 165 ++++++++++++++++---------------- marsyas-0.5.0-pd_extension.patch | 52 +++++----- marsyas-0.5.0-qpainterpath.patch | 84 ++++++++-------- marsyas-0.5.0-vamp_include_dirs.patch | 24 ++-- 4 files changed, 164 insertions(+), 161 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-12-29 13:07:54 UTC (rev 1087160) +++ PKGBUILD 2021-12-29 13:08:06 UTC (rev 1087161) @@ -1,81 +0,0 @@ -# Maintainer: David Runge <dv...@archlinux.org> -# Contributor: Felix Yan <felixonm...@archlinux.org> -# Contributor: MeMi69 <metalmili...@gmx.net> - -pkgname=marsyas -pkgver=0.5.0 -pkgrel=8 -pkgdesc="Music Analysis, Retrieval and Synthesis for Audio Signals" -arch=('x86_64') -url="http://marsyas.info" -license=('GPL2') -groups=('pd-externals' 'pro-audio' 'vamp-plugins') -depends=('gcc-libs' 'glibc' 'lame' 'libmad') -makedepends=('alsa-lib' 'cmake' 'doxygen' 'extra-cmake-modules' 'jack' -'libvorbis' 'pd' 'qt5-base' 'qt5-declarative' 'vamp-plugin-sdk') -optdepends=('pd: for ibt_pd external' - 'qt5-base: for MarGrid2, MarLpc, MarPhasevocoder, MarPlayer and marsyas-inspector' - 'qt5-declarative: for marsyas-inspector' - 'vamp-plugin-sdk: for vamp plugin') -provides=('libmarsyas.so') -source=( - "$pkgname-$pkgver.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/version-$pkgver.tar.gz" - "${pkgname}-0.5.0-qpainterpath.patch" - "${pkgname}-0.5.0-vamp_include_dirs.patch" - "${pkgname}-0.5.0-pd_extension.patch" -) -sha512sums=('0ff8943028753c70d409e78a8c5487da2006b7599c8909c0e0050433a6e7051f32b3c5f31fe833085a479d0486e4c96c5f4a4bd63ac00ee68b89dee941aebc9a' - 'a1a61964f3588b58ee95c16b70a1641b13032c07ec1fba030a9f5fa62c9f355f0c67a147dcdd04d70b0ef5d3a513fbe07341e73abeab3cce82cdfa65385fe22e' - '29d6a67195241d67b16da9afe522741cbdbfda84183f40f205d50d133bb8ebbcfebff01f011351851660bd59c6bb8cf629316de6345801caf6e0a41c7eeb354c' - '028329689ba460266b673a88d4ac316dd1077f93c6f2a5b3283961a457bf34fca64222b62f24d5478436c53a4868bd2a7337ffc1802089a2d829b3707ea48c6d') - -prepare() { - mv -v "${pkgname}-version-${pkgver}" "${pkgname}-${pkgver}" - cd "${pkgname}-${pkgver}" - # add missing include for QPainterPath (offered upstream): - # https://github.com/marsyas/marsyas/issues/77 - patch -Np1 -i ../"${pkgname}-0.5.0-qpainterpath.patch" - # fix include dirs for vamp plugins (offered upstream): - # https://github.com/marsyas/marsyas/issues/79 - patch -Np1 -i ../"${pkgname}-0.5.0-vamp_include_dirs.patch" - - # fixing build of pd external (offered upstream): - # https://github.com/marsyas/marsyas/issues/81 - patch -Np1 -i ../"${pkgname}-0.5.0-pd_extension.patch" -} - -build() { - cd "${pkgname}-${pkgver}" - # disable build of python module, as it is python2 only: - # https://github.com/marsyas/marsyas/issues/71 - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON \ - -DWITH_MAD=ON \ - -DWITH_LAME=ON \ - -DWITH_PD=ON \ - -DWITH_SWIG=OFF \ - -DWITH_VAMP=ON \ - -DWITH_VORBIS=ON \ - -B build \ - -S . - make VERBOSE=1 -C build -} - -package() { - depends+=('libasound.so' 'libjack.so' 'libvorbisfile.so') - cd "${pkgname}-${pkgver}" - make DESTDIR="$pkgdir" install -C build - # pd external - install -vDm 755 build/lib/ibt_pd.pd_linux \ - -vDm 644 src/${pkgname}_pd/ibt_pd-help.pd \ - -t "${pkgdir}/usr/lib/pd/extra/" - # vamp plugin - install -vDm 755 build/lib/mvamp.so -t "${pkgdir}/usr/lib/vamp" - # docs - install -vDm 644 {AUTHORS,README,TODO} \ - -t "${pkgdir}/usr/share/doc/${pkgname}" - # rename sfinfo https://bugs.archlinux.org/task/60787 - mv -v "${pkgdir}/usr/bin/sfinfo" "${pkgdir}/usr/bin/${pkgname}-sfinfo" - # rename record: https://bugs.archlinux.org/task/69837 - mv -v "${pkgdir}/usr/bin/record" "${pkgdir}/usr/bin/${pkgname}-record" -} Copied: marsyas/repos/community-x86_64/PKGBUILD (from rev 1087160, marsyas/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-12-29 13:08:06 UTC (rev 1087161) @@ -0,0 +1,84 @@ +# Maintainer: David Runge <dv...@archlinux.org> +# Contributor: Felix Yan <felixonm...@archlinux.org> +# Contributor: MeMi69 <metalmili...@gmx.net> + +pkgname=marsyas +pkgver=0.5.0 +pkgrel=9 +pkgdesc="Music Analysis, Retrieval and Synthesis for Audio Signals" +arch=(x86_64) +url="http://marsyas.info" +license=(GPL2) +groups=(pd-externals pro-audio vamp-plugins) +depends=(gcc-libs glibc lame libmad) +makedepends=(alsa-lib cmake doxygen extra-cmake-modules jack libvorbis pd +qt5-base qt5-declarative vamp-plugin-sdk) +optdepends=('pd: for ibt_pd external' + 'qt5-base: for MarGrid2, MarLpc, MarPhasevocoder, MarPlayer and marsyas-inspector' + 'qt5-declarative: for marsyas-inspector' + 'vamp-plugin-sdk: for vamp plugin') +provides=(libmarsyas.so) +source=( + "$pkgname-$pkgver.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/version-$pkgver.tar.gz" + "${pkgname}-0.5.0-qpainterpath.patch" + "${pkgname}-0.5.0-vamp_include_dirs.patch" + "${pkgname}-0.5.0-pd_extension.patch" +) +sha512sums=('0ff8943028753c70d409e78a8c5487da2006b7599c8909c0e0050433a6e7051f32b3c5f31fe833085a479d0486e4c96c5f4a4bd63ac00ee68b89dee941aebc9a' + 'a1a61964f3588b58ee95c16b70a1641b13032c07ec1fba030a9f5fa62c9f355f0c67a147dcdd04d70b0ef5d3a513fbe07341e73abeab3cce82cdfa65385fe22e' + '29d6a67195241d67b16da9afe522741cbdbfda84183f40f205d50d133bb8ebbcfebff01f011351851660bd59c6bb8cf629316de6345801caf6e0a41c7eeb354c' + '028329689ba460266b673a88d4ac316dd1077f93c6f2a5b3283961a457bf34fca64222b62f24d5478436c53a4868bd2a7337ffc1802089a2d829b3707ea48c6d') +b2sums=('d30b3f2ab5c2f71c56a86f8a23a3001122115ed97012347a1a3ede2b028c5a4398f712700c05715dedd67beb4195002bce4b3206d1957b1b1cf182ff4ad1fa7b' + 'de864ac8fd1e2f4f1b204ff86e3f4eb2fdc0fc088c1122b855c8da2156a8a4e659526c8959040d51300ec7cb86a57bfb509712ae936de275e0e47877e2e21af1' + 'a309be3a68e5e27c202f5078b566f248526283b37bef4a8237b88bdce2400f0810a07f5a50f5982612c958913896e8e76ef27fec448411d3309c6b797340c11f' + '3d41f3c13a9b313a7a1e25bcc6c8f6d194ec93bac390d9d9ba61c4cdf9a2ba45227679be8fe36bc421025894ed6e86d5621aef9bdc4431892ec5c2a935c927ae') + +prepare() { + mv -v "${pkgname}-version-${pkgver}" "${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" + # add missing include for QPainterPath (offered upstream): + # https://github.com/marsyas/marsyas/issues/77 + patch -Np1 -i ../"${pkgname}-0.5.0-qpainterpath.patch" + # fix include dirs for vamp plugins (offered upstream): + # https://github.com/marsyas/marsyas/issues/79 + patch -Np1 -i ../"${pkgname}-0.5.0-vamp_include_dirs.patch" + + # fixing build of pd external (offered upstream): + # https://github.com/marsyas/marsyas/issues/81 + patch -Np1 -i ../"${pkgname}-0.5.0-pd_extension.patch" +} + +build() { + CXXFLAGS+=' -ffat-lto-objects' + # disable build of python module, as it is python2 only: + # https://github.com/marsyas/marsyas/issues/71 + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON \ + -DWITH_MAD=ON \ + -DWITH_LAME=ON \ + -DWITH_PD=ON \ + -DWITH_SWIG=OFF \ + -DWITH_VAMP=ON \ + -DWITH_VORBIS=ON \ + -Wno-dev \ + -B build \ + -S "${pkgname}-${pkgver}" + make VERBOSE=1 -C build +} + +package() { + depends+=(libasound.so libjack.so libvorbisfile.so) + + make DESTDIR="$pkgdir" install -C build + # pd external + install -vDm 755 build/lib/ibt_pd.pd_linux -vDm 644 "${pkgname}-${pkgver}/src/${pkgname}_pd/ibt_pd-help.pd" -t "${pkgdir}/usr/lib/pd/extra/" + # vamp plugin + install -vDm 755 build/lib/mvamp.so -t "${pkgdir}/usr/lib/vamp" + # docs + install -vDm 644 "${pkgname}-${pkgver}/"{AUTHORS,README,TODO} -t "${pkgdir}/usr/share/doc/${pkgname}" + + # rename sfinfo https://bugs.archlinux.org/task/60787 + mv -v "${pkgdir}/usr/bin/sfinfo" "${pkgdir}/usr/bin/${pkgname}-sfinfo" + # rename record: https://bugs.archlinux.org/task/69837 + mv -v "${pkgdir}/usr/bin/record" "${pkgdir}/usr/bin/${pkgname}-record" +} Deleted: marsyas-0.5.0-pd_extension.patch =================================================================== --- marsyas-0.5.0-pd_extension.patch 2021-12-29 13:07:54 UTC (rev 1087160) +++ marsyas-0.5.0-pd_extension.patch 2021-12-29 13:08:06 UTC (rev 1087161) @@ -1,26 +0,0 @@ -diff --git c/src/marsyas_pd/CMakeLists.txt w/src/marsyas_pd/CMakeLists.txt -index 02eb7f68..458a2b21 100755 ---- c/src/marsyas_pd/CMakeLists.txt -+++ w/src/marsyas_pd/CMakeLists.txt -@@ -38,7 +38,7 @@ if(MARSYAS_MACOSX) - SET_TARGET_PROPERTIES(ibt_pd PROPERTIES SUFFIX ".pd_darwin") - elseif(MARSYAS_LINUX) - #define --export-dynamic -shared -- TARGET_LINK_LIBRARIES(ibt_pd ${MARSYAS_LIBRARY} "--export-dynamic -shared") -+ TARGET_LINK_LIBRARIES(ibt_pd ${MARSYAS_LIBRARY} "-export-dynamic -shared") - #define so extension as .pd_linux in Linux - SET_TARGET_PROPERTIES(ibt_pd PROPERTIES SUFFIX ".pd_linux") - elseif(MARSYAS_WIN32) -diff --git c/src/marsyas_pd/ibt_pd.cpp w/src/marsyas_pd/ibt_pd.cpp -index 7a362831..19fba7d4 100755 ---- c/src/marsyas_pd/ibt_pd.cpp -+++ w/src/marsyas_pd/ibt_pd.cpp -@@ -197,7 +197,7 @@ ibt_pd_new (t_symbol *s, int argc, t_atom *argv) - else if (!strcmp(firstarg->s_name, "@outPathName") && argc > 1) - { - post("ibt_pd %s: %s", firstarg->s_name, atom_getsymbol(argv+1)->s_name); -- x->outPathName = atom_getsymbol(argv+1)->s_name; -+ x->outPathName = const_cast<char*>(atom_getsymbol(argv+1)->s_name); - argc -= 2; argv += 2; - } - else if (!strcmp(firstarg->s_name, "@stateRecovery") && argc > 1) Copied: marsyas/repos/community-x86_64/marsyas-0.5.0-pd_extension.patch (from rev 1087160, marsyas/trunk/marsyas-0.5.0-pd_extension.patch) =================================================================== --- marsyas-0.5.0-pd_extension.patch (rev 0) +++ marsyas-0.5.0-pd_extension.patch 2021-12-29 13:08:06 UTC (rev 1087161) @@ -0,0 +1,26 @@ +diff --git c/src/marsyas_pd/CMakeLists.txt w/src/marsyas_pd/CMakeLists.txt +index 02eb7f68..458a2b21 100755 +--- c/src/marsyas_pd/CMakeLists.txt ++++ w/src/marsyas_pd/CMakeLists.txt +@@ -38,7 +38,7 @@ if(MARSYAS_MACOSX) + SET_TARGET_PROPERTIES(ibt_pd PROPERTIES SUFFIX ".pd_darwin") + elseif(MARSYAS_LINUX) + #define --export-dynamic -shared +- TARGET_LINK_LIBRARIES(ibt_pd ${MARSYAS_LIBRARY} "--export-dynamic -shared") ++ TARGET_LINK_LIBRARIES(ibt_pd ${MARSYAS_LIBRARY} "-export-dynamic -shared") + #define so extension as .pd_linux in Linux + SET_TARGET_PROPERTIES(ibt_pd PROPERTIES SUFFIX ".pd_linux") + elseif(MARSYAS_WIN32) +diff --git c/src/marsyas_pd/ibt_pd.cpp w/src/marsyas_pd/ibt_pd.cpp +index 7a362831..19fba7d4 100755 +--- c/src/marsyas_pd/ibt_pd.cpp ++++ w/src/marsyas_pd/ibt_pd.cpp +@@ -197,7 +197,7 @@ ibt_pd_new (t_symbol *s, int argc, t_atom *argv) + else if (!strcmp(firstarg->s_name, "@outPathName") && argc > 1) + { + post("ibt_pd %s: %s", firstarg->s_name, atom_getsymbol(argv+1)->s_name); +- x->outPathName = atom_getsymbol(argv+1)->s_name; ++ x->outPathName = const_cast<char*>(atom_getsymbol(argv+1)->s_name); + argc -= 2; argv += 2; + } + else if (!strcmp(firstarg->s_name, "@stateRecovery") && argc > 1) Deleted: marsyas-0.5.0-qpainterpath.patch =================================================================== --- marsyas-0.5.0-qpainterpath.patch 2021-12-29 13:07:54 UTC (rev 1087160) +++ marsyas-0.5.0-qpainterpath.patch 2021-12-29 13:08:06 UTC (rev 1087161) @@ -1,42 +0,0 @@ -diff -ruN a/src/otherlibs/qwt/qwt_null_paintdevice.h b/src/otherlibs/qwt/qwt_null_paintdevice.h ---- a/src/otherlibs/qwt/qwt_null_paintdevice.h 2015-02-27 05:13:13.000000000 +0100 -+++ b/src/otherlibs/qwt/qwt_null_paintdevice.h 2021-03-01 11:27:33.148801182 +0100 -@@ -14,6 +14,10 @@ - #include <qpaintdevice.h> - #include <qpaintengine.h> - -+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) -+#include <QPainterPath> -+#endif -+ - /*! - \brief A null paint device doing nothing - -diff -ruN a/src/otherlibs/qwt/qwt_painter.h b/src/otherlibs/qwt/qwt_painter.h ---- a/src/otherlibs/qwt/qwt_painter.h 2015-02-27 05:13:13.000000000 +0100 -+++ b/src/otherlibs/qwt/qwt_painter.h 2021-03-01 11:21:34.094049011 +0100 -@@ -18,6 +18,10 @@ - #include <qline.h> - #include <qpalette.h> - -+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) -+#include <QPainterPath> -+#endif -+ - class QPainter; - class QBrush; - class QColor; -diff -ruN a/src/otherlibs/qwt/qwt_painter_command.h b/src/otherlibs/qwt/qwt_painter_command.h ---- a/src/otherlibs/qwt/qwt_painter_command.h 2015-02-27 05:13:13.000000000 +0100 -+++ b/src/otherlibs/qwt/qwt_painter_command.h 2021-03-01 11:27:06.772046304 +0100 -@@ -16,6 +16,10 @@ - #include <qimage.h> - #include <qpolygon.h> - -+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) -+#include <QPainterPath> -+#endif -+ - class QPainterPath; - - /*! Copied: marsyas/repos/community-x86_64/marsyas-0.5.0-qpainterpath.patch (from rev 1087160, marsyas/trunk/marsyas-0.5.0-qpainterpath.patch) =================================================================== --- marsyas-0.5.0-qpainterpath.patch (rev 0) +++ marsyas-0.5.0-qpainterpath.patch 2021-12-29 13:08:06 UTC (rev 1087161) @@ -0,0 +1,42 @@ +diff -ruN a/src/otherlibs/qwt/qwt_null_paintdevice.h b/src/otherlibs/qwt/qwt_null_paintdevice.h +--- a/src/otherlibs/qwt/qwt_null_paintdevice.h 2015-02-27 05:13:13.000000000 +0100 ++++ b/src/otherlibs/qwt/qwt_null_paintdevice.h 2021-03-01 11:27:33.148801182 +0100 +@@ -14,6 +14,10 @@ + #include <qpaintdevice.h> + #include <qpaintengine.h> + ++#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) ++#include <QPainterPath> ++#endif ++ + /*! + \brief A null paint device doing nothing + +diff -ruN a/src/otherlibs/qwt/qwt_painter.h b/src/otherlibs/qwt/qwt_painter.h +--- a/src/otherlibs/qwt/qwt_painter.h 2015-02-27 05:13:13.000000000 +0100 ++++ b/src/otherlibs/qwt/qwt_painter.h 2021-03-01 11:21:34.094049011 +0100 +@@ -18,6 +18,10 @@ + #include <qline.h> + #include <qpalette.h> + ++#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) ++#include <QPainterPath> ++#endif ++ + class QPainter; + class QBrush; + class QColor; +diff -ruN a/src/otherlibs/qwt/qwt_painter_command.h b/src/otherlibs/qwt/qwt_painter_command.h +--- a/src/otherlibs/qwt/qwt_painter_command.h 2015-02-27 05:13:13.000000000 +0100 ++++ b/src/otherlibs/qwt/qwt_painter_command.h 2021-03-01 11:27:06.772046304 +0100 +@@ -16,6 +16,10 @@ + #include <qimage.h> + #include <qpolygon.h> + ++#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) ++#include <QPainterPath> ++#endif ++ + class QPainterPath; + + /*! Deleted: marsyas-0.5.0-vamp_include_dirs.patch =================================================================== --- marsyas-0.5.0-vamp_include_dirs.patch 2021-12-29 13:07:54 UTC (rev 1087160) +++ marsyas-0.5.0-vamp_include_dirs.patch 2021-12-29 13:08:06 UTC (rev 1087161) @@ -1,12 +0,0 @@ -diff -ruN a/src/mvamp/CMakeLists.txt b/src/mvamp/CMakeLists.txt ---- a/src/mvamp/CMakeLists.txt 2015-02-27 05:13:13.000000000 +0100 -+++ b/src/mvamp/CMakeLists.txt 2021-03-01 12:03:46.386472537 +0100 -@@ -14,7 +14,7 @@ - - add_library(mvamp SHARED ${MVamp_SOURCES}) - --include_directories(${VAMP_INCLUDE_DIR}) -+include_directories(${VAMP_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../marsyas/marsystems/) - - # In case we build the static version of Marsyas, we need to link - # to that specific archive library. Also linking some additional libs/frameworks Copied: marsyas/repos/community-x86_64/marsyas-0.5.0-vamp_include_dirs.patch (from rev 1087160, marsyas/trunk/marsyas-0.5.0-vamp_include_dirs.patch) =================================================================== --- marsyas-0.5.0-vamp_include_dirs.patch (rev 0) +++ marsyas-0.5.0-vamp_include_dirs.patch 2021-12-29 13:08:06 UTC (rev 1087161) @@ -0,0 +1,12 @@ +diff -ruN a/src/mvamp/CMakeLists.txt b/src/mvamp/CMakeLists.txt +--- a/src/mvamp/CMakeLists.txt 2015-02-27 05:13:13.000000000 +0100 ++++ b/src/mvamp/CMakeLists.txt 2021-03-01 12:03:46.386472537 +0100 +@@ -14,7 +14,7 @@ + + add_library(mvamp SHARED ${MVamp_SOURCES}) + +-include_directories(${VAMP_INCLUDE_DIR}) ++include_directories(${VAMP_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../marsyas/marsystems/) + + # In case we build the static version of Marsyas, we need to link + # to that specific archive library. Also linking some additional libs/frameworks