Date: Saturday, April 24, 2021 @ 16:10:09 Author: dvzrv Revision: 923691
upgpkg: giada 0.17.2-1: Upgrade to 0.17.2. Apply (upstreamed patches) to fix issues with build and installation. Open upstream ticket about not being able to run tests. Update patch to devendor nlohmann-json. Added: giada/trunk/giada-0.17.2-devendor_nlohmann_json.patch Modified: giada/trunk/PKGBUILD Deleted: giada/trunk/giada-0.17.0-devendor_nlohmann_json.patch giada/trunk/giada-0.17.0-rtmidi_cppflags.patch -------------------------------------------+ PKGBUILD | 76 +++++++++++++--------------- giada-0.17.0-devendor_nlohmann_json.patch | 55 -------------------- giada-0.17.0-rtmidi_cppflags.patch | 23 -------- giada-0.17.2-devendor_nlohmann_json.patch | 55 ++++++++++++++++++++ 4 files changed, 92 insertions(+), 117 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-04-24 16:06:09 UTC (rev 923690) +++ PKGBUILD 2021-04-24 16:10:09 UTC (rev 923691) @@ -1,7 +1,7 @@ # Maintainer: David Runge <[email protected]> pkgname=giada -pkgver=0.17.0 +pkgver=0.17.2 pkgrel=1 pkgdesc="A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians" arch=('x86_64') @@ -10,18 +10,22 @@ groups=('pro-audio') depends=('gcc-libs' 'glibc' 'libx11' 'libxpm') # upstream vendors a hacked rtaudio :( -makedepends=('alsa-lib' 'cmake' 'fltk' 'gendesk' 'imagemagick' 'jack' +makedepends=('alsa-lib' 'catch2' 'cmake' 'fltk' 'gendesk' 'imagemagick' 'jack' 'libpulse' 'libsamplerate' 'libsndfile' 'libxrandr' 'nlohmann-json' 'rtmidi') -checkdepends=('catch2' 'xorg-server-xvfb') +checkdepends=('xorg-server-xvfb') +provides=('vst3-host') source=("https://www.giadamusic.com/data/${pkgname}-${pkgver}-src.tar.gz"; - "$pkgname-0.17.0-rtmidi_cppflags.patch" - "$pkgname-0.17.0-devendor_nlohmann_json.patch") -sha512sums=('1a94da20d0901315b05adc225aa3f21e83abaa27157b810bfcf9d55fa2fa77ebaea8305aa20e37851a21797f9a986dde38e76cdb70a0ef3ffdf3a6e0d82b32c6' - 'ae222bb63b0388ef1b02ff2cda0e589545c80fae26cbf06c04e0963a661e32b4d6746eea424359a44bb20e7568dbb5335359c5226c36d9c8b86d10130e83fedc' - '5b4b6c6c421851f4da72b6fb4ff457156d3332c5c7a795edffe05386d48864830e7b3afb4011996a8cd5284d2fdbc2e0da3d590108e04d00227d25bc3127f506') -b2sums=('5dc1dc140f38c59964a67bc7dc4b0a6f0ccb91887d29e5e35eeb4700f2e1f53557b71a384e7a17b8757cb568b5ca2a02e3e29ffccceced9b6fba7d983524b499' - 'e38277a1c77b2bfe6249618524b15909a91dd33fc635e3698e240797d3a3464737060240fe3956a805855a29f3326216adf6df28726e267cc9a1d0f24bd5d7c8' - '804fa149c6a3e6f860136a7abe0b1a4263355fb5c3b899643c7f5c87775035669aa22ace3b51729ee976b4a84f57c255ba23ba82367483a739a8baaf520130b7') + "$pkgname-0.17.2-devendor_nlohmann_json.patch" + "$pkgname-0.17.2-executable_install.patch::https://github.com/monocasual/giada/pull/462/commits/cb2d5e18befa79905acd31bf2fafc610f22c79fa.patch"; + "$pkgname-0.17.2-missing_string_include.patch::https://github.com/monocasual/giada/pull/461/commits/5932bc51d5bdca02662ee99ecf8f95b53b4e656e.patch";) +sha512sums=('7f59593b3b98a3d012a769e5293727ef4444c9a71185855f4f832e9860b93f502d4b8476a6f69c64bbec80ccf3c4b5f665db4b05329ee6ce837cebfaafa0cac4' + 'b9d952c0816dd2b81dadff24521b19f305ca5ddeb1964dd81ce93e6f63b25dbf291c07e528cc2836f268a095bf9920786331a615230416f44a9014ff581a0bce' + 'd2581abb178661953e7661a12ab011b7f145d9c43fb3ef75d0a057a6ee2a11b19152980a8e0817e5ef96b026e6f318913374f5573b7b63606bce1818bc808978' + 'df2b6b7d868d7f738c1ce6532f8f5b7cdcc867a5c7bd560fe8de38675619679cf4e8d330ffda61b3203e7836a8610a9518af3079f8ff322f3c82f3a361189d57') +b2sums=('b65b3502eaca99fd33919096591ccb5d3bb74432977ecae27022f11536b0c6ed2fc2dc014f2951d90c3bbf9893af2088945ed9df8c23ad9866e89f25dd268a7c' + 'a482f356969c5d184a1eb0945477040cc7c5d1447fee0159cc5d2da05faea0bd696123b0559bdced148b301181f93726a515df24a814dbd08d207e2959f31305' + 'bd3b813d262eacc530cb633fa143e794d5e558da00d25bd70a2e32128711111f44a8bf207084d31b8fe32b8114dca8b2ec77c56fd2ce60ee923031632fa83f20' + '6c4b796d167678783377e5e46d19d24f055b6cc352f8c87ab5bd27f5f5b0e7624926f294d49633c8086ae1e5c6da8b994700eb7d298b02989df51feba557b920') prepare() { mv -v "$pkgname-$pkgver-src" "$pkgname-$pkgver" @@ -33,44 +37,38 @@ --name Giada \ --categories "AudioVideo;Audio;Midi;Sequencer" - # remove targets for missing files: - # https://github.com/monocasual/giada/issues/431 - sed -e '/baseButton/d' -i Makefile.am - - # add rtmidi cppflags: - # https://github.com/monocasual/giada/issues/417 - patch -Np1 -i ../"$pkgname-0.17.0-rtmidi_cppflags.patch" - # devendor nlohmann-json - patch -Np1 -i ../"$pkgname-0.17.0-devendor_nlohmann_json.patch" - - # fixing test includes to use system catch2 - sed -e 's|catch\.hpp|catch2/catch\.hpp|g' -i tests/*.cpp - autoreconf -vfi + patch -Np1 -i ../"$pkgname-0.17.2-devendor_nlohmann_json.patch" + # install the executable to the bin directory + patch -Np1 -i ../"$pkgname-0.17.2-executable_install.patch" + # fix missing string include + patch -Np1 -i ../"$pkgname-0.17.2-missing_string_include.patch" } build() { cd "$pkgname-$pkgver" - ./configure --prefix=/usr \ - --target=linux \ - --enable-system-catch - make + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE='None' \ + -DWITH_VST3=ON \ + -DWITH_TESTS=ON \ + -W no-dev \ + -B build \ + -S . + make VERBOSE=1 -C build } -check(){ - cd "$pkgname-$pkgver" - # move binary to expected directory: - # https://github.com/monocasual/giada/issues/432 - mkdir -vp build - cp -av "${pkgname}" build/ - xvfb-run -a make -k check -} +# # unclear how to run tests: https://github.com/monocasual/giada/issues/463 +# check(){ +# cd "$pkgname-$pkgver" +# make check VERBOSE=1 -C build +# } package() { - depends+=('libasound.so' 'libfltk.so' 'libjack.so' 'libpulse.so' - 'libpulse-simple.so' 'librtmidi.so' 'libsamplerate.so' 'libsndfile.so') + depends+=('libasound.so' 'libfltk.so' 'libfreetype.so' 'libjack.so' + 'libpulse.so' 'libpulse-simple.so' 'librtmidi.so' 'libsamplerate.so' + 'libsndfile.so') cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir/" install -C build # XDG integration install -vDm 644 "${pkgname}.desktop" -t "${pkgdir}/usr/share/applications" install -vDm 644 "extras/${pkgname}-logo.svg" \ Deleted: giada-0.17.0-devendor_nlohmann_json.patch =================================================================== --- giada-0.17.0-devendor_nlohmann_json.patch 2021-04-24 16:06:09 UTC (rev 923690) +++ giada-0.17.0-devendor_nlohmann_json.patch 2021-04-24 16:10:09 UTC (rev 923691) @@ -1,55 +0,0 @@ -diff -ruN a/src/core/conf.cpp b/src/core/conf.cpp ---- a/src/core/conf.cpp 2020-11-15 21:26:40.000000000 +0100 -+++ b/src/core/conf.cpp 2020-11-20 17:28:36.176616521 +0100 -@@ -29,7 +29,7 @@ - #include <cassert> - #include <string> - #include <FL/Fl.H> --#include "deps/json/single_include/nlohmann/json.hpp" -+#include <nlohmann/json.hpp> - #include "utils/fs.h" - #include "utils/log.h" - #include "core/const.h" -@@ -315,4 +315,4 @@ - ofs << j; - return true; - } --}}} // giada::m::conf:: -\ No newline at end of file -+}}} // giada::m::conf:: -diff -ruN a/src/core/init.cpp b/src/core/init.cpp ---- a/src/core/init.cpp 2020-11-15 21:26:40.000000000 +0100 -+++ b/src/core/init.cpp 2020-11-20 17:29:53.759248660 +0100 -@@ -35,7 +35,7 @@ - #include <X11/Xlib.h> // For XInitThreads - #endif - #include <FL/Fl.H> --#include "deps/json/single_include/nlohmann/json.hpp" -+#include <nlohmann/json.hpp> - #include "gui/updater.h" - #include "utils/log.h" - #include "utils/fs.h" -diff -ruN a/src/core/midiMapConf.cpp b/src/core/midiMapConf.cpp ---- a/src/core/midiMapConf.cpp 2020-11-15 21:26:40.000000000 +0100 -+++ b/src/core/midiMapConf.cpp 2020-11-20 17:28:01.216937457 +0100 -@@ -30,7 +30,7 @@ - #include <string> - #include <cstring> - #include <filesystem> --#include "deps/json/single_include/nlohmann/json.hpp" -+#include <nlohmann/json.hpp> - #include "utils/string.h" - #include "utils/log.h" - #include "utils/fs.h" -diff -ruN a/src/core/patch.cpp b/src/core/patch.cpp ---- a/src/core/patch.cpp 2020-11-15 21:26:40.000000000 +0100 -+++ b/src/core/patch.cpp 2020-11-20 17:30:12.475748254 +0100 -@@ -26,7 +26,7 @@ - - - #include <fstream> --#include "deps/json/single_include/nlohmann/json.hpp" -+#include <nlohmann/json.hpp> - #include "utils/math.h" - #include "utils/log.h" - #include "core/mixer.h" Deleted: giada-0.17.0-rtmidi_cppflags.patch =================================================================== --- giada-0.17.0-rtmidi_cppflags.patch 2021-04-24 16:06:09 UTC (rev 923690) +++ giada-0.17.0-rtmidi_cppflags.patch 2021-04-24 16:10:09 UTC (rev 923691) @@ -1,23 +0,0 @@ -diff -ruN a/Makefile.am b/Makefile.am ---- a/Makefile.am 2020-11-15 21:26:40.000000000 +0100 -+++ b/Makefile.am 2020-11-20 18:53:06.031868664 +0100 -@@ -402,7 +402,7 @@ - if LINUX - - # Add preprocessor flags to enable ALSA, Pulse and JACK in RtAudio. --cppFlags += -D__LINUX_ALSA__ -D__LINUX_PULSE__ -D__UNIX_JACK__ -+cppFlags += -D__LINUX_ALSA__ -D__LINUX_PULSE__ -D__UNIX_JACK__ $(RTMIDI_CFLAGS) - - ldAdd += -lsndfile -lfltk -lXext -lX11 -lXft -lXpm -lm -ljack -lasound \ - -lpthread -ldl -lpulse-simple -lpulse -lsamplerate -lrtmidi \ -diff -ruN a/configure.ac b/configure.ac ---- a/configure.ac 2020-11-15 21:26:40.000000000 +0100 -+++ b/configure.ac 2020-11-20 18:52:11.715602516 +0100 -@@ -138,6 +138,7 @@ - [], - [AC_MSG_ERROR([library 'rtMidi' not found!])] - ) -+ PKG_CHECK_MODULES([RTMIDI], [rtmidi]) - AC_LANG_POP - fi - Added: giada-0.17.2-devendor_nlohmann_json.patch =================================================================== --- giada-0.17.2-devendor_nlohmann_json.patch (rev 0) +++ giada-0.17.2-devendor_nlohmann_json.patch 2021-04-24 16:10:09 UTC (rev 923691) @@ -0,0 +1,55 @@ +diff -ruN a/src/core/conf.cpp b/src/core/conf.cpp +--- a/src/core/conf.cpp 2021-03-31 18:44:48.000000000 +0200 ++++ b/src/core/conf.cpp 2021-04-24 16:18:22.530287443 +0200 +@@ -27,7 +27,7 @@ + #include "conf.h" + #include "core/const.h" + #include "core/types.h" +-#include "deps/json/single_include/nlohmann/json.hpp" ++#include <nlohmann/json.hpp> + #include "utils/fs.h" + #include "utils/log.h" + #include <FL/Fl.H> +@@ -315,4 +315,4 @@ + ofs << j; + return true; + } +-} // namespace giada::m::conf +\ No newline at end of file ++} // namespace giada::m::conf +diff -ruN a/src/core/init.cpp b/src/core/init.cpp +--- a/src/core/init.cpp 2021-03-31 18:44:48.000000000 +0200 ++++ b/src/core/init.cpp 2021-04-24 16:19:01.257069455 +0200 +@@ -54,7 +54,7 @@ + #include "core/sequencer.h" + #include "core/wave.h" + #include "core/waveManager.h" +-#include "deps/json/single_include/nlohmann/json.hpp" ++#include <nlohmann/json.hpp> + #include "glue/main.h" + #include "gui/dialogs/mainWindow.h" + #include "gui/dialogs/warnings.h" +diff -ruN a/src/core/midiMapConf.cpp b/src/core/midiMapConf.cpp +--- a/src/core/midiMapConf.cpp 2021-03-31 18:44:48.000000000 +0200 ++++ b/src/core/midiMapConf.cpp 2021-04-24 16:17:56.890211073 +0200 +@@ -26,7 +26,7 @@ + + #include "midiMapConf.h" + #include "const.h" +-#include "deps/json/single_include/nlohmann/json.hpp" ++#include <nlohmann/json.hpp> + #include "utils/fs.h" + #include "utils/log.h" + #include "utils/string.h" +diff -ruN a/src/core/patch.cpp b/src/core/patch.cpp +--- a/src/core/patch.cpp 2021-03-31 18:44:48.000000000 +0200 ++++ b/src/core/patch.cpp 2021-04-24 16:19:23.867136797 +0200 +@@ -26,7 +26,7 @@ + + #include "patch.h" + #include "core/mixer.h" +-#include "deps/json/single_include/nlohmann/json.hpp" ++#include <nlohmann/json.hpp> + #include "utils/log.h" + #include "utils/math.h" + #include <fstream>
