drumstick: 1.1.3 -> 2.1.1

This commit is contained in:
Orivej Desh 2021-04-26 20:30:24 +00:00
parent 2d9689351c
commit 1cf7f3cf6b
3 changed files with 11 additions and 15 deletions

View file

@ -1,19 +1,18 @@
{ lib, stdenv, fetchurl
, cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, pkg-config, wrapQtAppsHook
, cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, graphviz-nox, pkg-config, qttools, wrapQtAppsHook
, alsaLib, fluidsynth, qtbase, qtsvg, libpulseaudio
}:
stdenv.mkDerivation rec {
pname = "drumstick";
version = "1.1.3";
version = "2.1.1";
src = fetchurl {
url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2";
sha256 = "1n9wvg79yvkygrkc8xd8pgrd3d7hqmr7gh24dccf0px23lla9b3m";
sha256 = "06lz4kzpgg5lalcjb14pi35jxca5f4j6ckqf6mdxs1k42dfhjpjp";
};
patches = [
./drumstick-fluidsynth.patch
./drumstick-plugins.patch
];
@ -24,13 +23,17 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" ];
nativeBuildInputs = [
cmake docbook_xml_dtd_45 docbook_xml_dtd_45 docbook_xsl doxygen pkg-config wrapQtAppsHook
cmake docbook_xml_dtd_45 docbook_xml_dtd_45 docbook_xsl doxygen graphviz-nox pkg-config qttools wrapQtAppsHook
];
buildInputs = [
alsaLib fluidsynth libpulseaudio qtbase qtsvg
];
cmakeFlags = [
"-DUSE_DBUS=ON"
];
meta = with lib; {
maintainers = with maintainers; [ solson ];
description = "MIDI libraries for Qt5/C++";

View file

@ -1,9 +0,0 @@
It works with fluidsynth 2.
Backported from r400: https://sourceforge.net/p/drumstick/code/400/
--- a/library/rt-backends/CMakeLists.txt
+++ b/library/rt-backends/CMakeLists.txt
@@ -54,1 +54,1 @@ if (PKG_CONFIG_FOUND)
- pkg_check_modules(FLUIDSYNTH fluidsynth>=1.1.1 fluidsynth<=1.1.11)
+ pkg_check_modules(FLUIDSYNTH fluidsynth>=1.1.1)

View file

@ -1,12 +1,14 @@
Make it look for its plugin in its own installation directory.
Without this vmpk fails to start with "Unable to initialize all MIDI drivers".
--- a/library/rt/backendmanager.cpp
+++ b/library/rt/backendmanager.cpp
@@ -159,6 +159,7 @@ namespace rt {
foreach(const QString& path, QCoreApplication::libraryPaths()) {
d->appendDir( path + QDir::separator() + QSTR_DRUMSTICK, result );
}
+ d->appendDir( "@out@/lib/drumstick", result );
+ d->appendDir( "@out@/lib/" + QSTR_DRUMSTICK, result );
return result;
}