Merge pull request #32484 from magnetophon/qsampler

qsampler: svn-2342 -> 0.4.3
This commit is contained in:
Jörg Thalheim 2017-12-09 09:22:38 +00:00 committed by GitHub
commit 3a20229361
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 79 additions and 116 deletions

View file

@ -1,25 +1,25 @@
{ stdenv, fetchsvn, autoconf, automake, docbook_xml_dtd_45 { stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, which
, docbook_xsl, gtkmm2, intltool, libgig, libsndfile, libtool, libxslt , docbook_xml_dtd_45, docbook_xsl, gtkmm2, libgig, libsndfile, libxslt
, pkgconfig }: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gigedit-svn-${version}"; name = "gigedit-${version}";
version = "2342"; version = "1.1.0";
src = fetchsvn { src = fetchurl {
url = "https://svn.linuxsampler.org/svn/gigedit/trunk"; url = "http://download.linuxsampler.org/packages/${name}.tar.bz2";
rev = "${version}"; sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni";
sha256 = "0wi94gymj0ns5ck9lq1d970gb4gnzrq4b57j5j7k3d6185yg2gjs";
}; };
patchPhase = "sed -e 's/which/type -P/g' -i Makefile.cvs"; patches = [ ./gigedit-1.1.0-pangomm-2.40.1.patch ];
preConfigure = "make -f Makefile.cvs"; preConfigure = "make -f Makefile.svn";
buildInputs = [ nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ];
autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm2 intltool
libgig libsndfile libtool libxslt pkgconfig buildInputs = [ docbook_xml_dtd_45 docbook_xsl gtkmm2 libgig libsndfile libxslt ];
];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.linuxsampler.org; homepage = http://www.linuxsampler.org;

View file

@ -0,0 +1,15 @@
--- a/src/gigedit/wrapLabel.cc
+++ b/src/gigedit/wrapLabel.cc
@@ -64,12 +64,7 @@ WrapLabel::WrapLabel(const Glib::ustring &text) // IN: The label text
: mWrapWidth(0),
mWrapHeight(0)
{
- // pangomm >= 2.35.1
-#if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && (PANGOMM_MINOR_VERSION > 35 || (PANGOMM_MINOR_VERSION == 35 && PANGOMM_MICRO_VERSION >= 1)))
- get_layout()->set_wrap(Pango::WrapMode::WORD_CHAR);
-#else
get_layout()->set_wrap(Pango::WRAP_WORD_CHAR);
-#endif
set_alignment(0.0, 0.0);
set_text(text);
}

View file

@ -1,31 +1,28 @@
{ stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison { stdenv, fetchurl, autoconf, automake, bison, libtool, pkgconfig, which
, libjack2, libgig, libsndfile, libtool, lv2, pkgconfig }: , alsaLib, asio, libjack2, libgig, libsndfile, lv2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "linuxsampler-svn-${version}"; name = "linuxsampler-${version}";
version = "2340"; version = "2.1.0";
src = fetchsvn { src = fetchurl {
url = "https://svn.linuxsampler.org/svn/linuxsampler/trunk"; url = "http://download.linuxsampler.org/packages/${name}.tar.bz2";
rev = "${version}"; sha256 = "0fdxpw7jjfi058l95131d6d8538h05z7n94l60i6mhp9xbplj2jf";
sha256 = "0zsrvs9dwwhjx733m45vfi11yjkqv33z8qxn2i9qriq5zs1f0kd7";
}; };
patches = ./linuxsampler_lv2_sfz_fix.diff;
# It fails to compile without this option. I'm not sure what the bug # It fails to compile without this option. I'm not sure what the bug
# is, but everything works OK for me (goibhniu). # is, but everything works OK for me (goibhniu).
configureFlags = [ "--disable-nptl-bug-check" ]; configureFlags = [ "--disable-nptl-bug-check" ];
preConfigure = '' preConfigure = ''
sed -e 's/which/type -P/g' -i scripts/generate_parser.sh make -f Makefile.svn
make -f Makefile.cvs
''; '';
buildInputs = [ nativeBuildInputs = [ autoconf automake bison libtool pkgconfig which ];
alsaLib asio autoconf automake bison libjack2 libgig libsndfile
libtool lv2 pkgconfig buildInputs = [ alsaLib asio libjack2 libgig libsndfile lv2 ];
];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.linuxsampler.org; homepage = http://www.linuxsampler.org;
@ -40,7 +37,7 @@ stdenv.mkDerivation rec {
prior written permission by the LinuxSampler authors. If you prior written permission by the LinuxSampler authors. If you
have questions on the subject, that are not yet covered by the have questions on the subject, that are not yet covered by the
FAQ, please contact us. FAQ, please contact us.
''; '';
license = licenses.unfree; license = licenses.unfree;
maintainers = [ maintainers.goibhniu ]; maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux; platforms = platforms.linux;

View file

@ -1,50 +0,0 @@
Index: linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp
===================================================================
--- linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (revision 2359)
+++ linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (working copy)
@@ -18,6 +18,8 @@
* MA 02110-1301 USA *
***************************************************************************/
+#define _BSD_SOURCE 1 /* for realpath() */
+
#include <algorithm>
#include <cassert>
#include <cstdio>
@@ -118,6 +120,23 @@
dmsg(2, ("linuxsampler: Deactivate\n"));
}
+ static String RealPath(const String& path)
+ {
+ String out = path;
+ char* cpath = NULL;
+#ifdef _WIN32
+ cpath = (char*)malloc(MAX_PATH);
+ GetFullPathName(path.c_str(), MAX_PATH, cpath, NULL);
+#else
+ cpath = realpath(path.c_str(), NULL);
+#endif
+ if (cpath) {
+ out = cpath;
+ free(cpath);
+ }
+ return out;
+ }
+
String PluginLv2::PathToState(const String& path) {
if (MapPath) {
char* cstr = MapPath->abstract_path(MapPath->handle, path.c_str());
@@ -131,9 +150,10 @@
String PluginLv2::PathFromState(const String& path) {
if (MapPath) {
char* cstr = MapPath->absolute_path(MapPath->handle, path.c_str());
- const String abstract_path(cstr);
+ // Resolve symbolic links so SFZ sample paths load correctly
+ const String absolute_path(RealPath(cstr));
free(cstr);
- return abstract_path;
+ return absolute_path;
}
return path;
}

View file

@ -1,21 +1,22 @@
{ stdenv, fetchsvn, autoconf, automake, liblscp, libtool, pkgconfig { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, qttools
, qt4 }: , liblscp, libgig, qtbase }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qsampler-svn-${version}"; name = "qsampler-${version}";
version = "2342"; version = "0.4.3";
src = fetchsvn { src = fetchurl {
url = "https://svn.linuxsampler.org/svn/qsampler/trunk"; url = "mirror://sourceforge/qsampler/${name}.tar.gz";
rev = "${version}"; sha256 = "1wg19022gyzy8rk9npfav9kz9z2qicqwwb2x5jz5hshzf3npx1fi";
sha256 = "17w3vgpgfmvl11wsd5ndk9zdggl3gbzv3wbd45dyf2al4i0miqnx";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ];
buildInputs = [ autoconf automake liblscp libtool qt4 ]; buildInputs = [ liblscp libgig qtbase ];
preConfigure = "make -f Makefile.svn"; preConfigure = "make -f Makefile.svn";
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.linuxsampler.org; homepage = http://www.linuxsampler.org;
description = "Graphical frontend to LinuxSampler"; description = "Graphical frontend to LinuxSampler";

View file

@ -1,19 +1,21 @@
{ stdenv, fetchsvn, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }: { stdenv, fetchurl, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libgig-svn-${version}"; name = "libgig-${version}";
version = "2334"; version = "4.1.0";
src = fetchsvn { src = fetchurl {
url = "https://svn.linuxsampler.org/svn/libgig/trunk"; url = "http://download.linuxsampler.org/packages/${name}.tar.bz2";
rev = "${version}"; sha256 = "02xx6bqxzgkvrawwnzrnxx1ypk244q4kpwfd58266f9ji8kq18h6";
sha256 = "0i7sj3zm6banl5avjdxblx0mlbxxzbsbr4x5hsl2fhrdsv5dnxhc";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
buildInputs = [ autoconf automake libsndfile libtool libuuid ];
preConfigure = "make -f Makefile.cvs"; buildInputs = [ libsndfile libuuid ];
preConfigure = "make -f Makefile.svn";
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.linuxsampler.org; homepage = http://www.linuxsampler.org;

View file

@ -1,19 +1,19 @@
{ stdenv, fetchsvn, autoconf, automake, libtool, pkgconfig }: { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "liblscp-svn-${version}"; name = "liblscp-${version}";
version = "2319"; version = "0.5.8";
src = fetchsvn { src = fetchurl {
url = "https://svn.linuxsampler.org/svn/liblscp/trunk"; url = "http://download.linuxsampler.org/packages/${name}.tar.gz";
rev = "${version}"; sha256 = "00cfafkw1n80sdjwm9zdsg5vx287wqpgpbajd3zmiz415wzr84dn";
sha256 = "0jgdy9gi9n8x2pqrbll9158vhx8293lnxv8vzl0szcincslgk7hi";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
buildInputs = [ autoconf automake libtool ];
preConfigure = "make -f Makefile.svn"; preConfigure = "make -f Makefile.git";
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.linuxsampler.org; homepage = http://www.linuxsampler.org;

View file

@ -15638,9 +15638,7 @@ with pkgs;
polarssl = mbedtls_1_3; polarssl = mbedtls_1_3;
}; };
linuxsampler = callPackage ../applications/audio/linuxsampler { linuxsampler = callPackage ../applications/audio/linuxsampler { };
bison = bison2;
};
llpp = ocaml-ng.ocamlPackages.callPackage ../applications/misc/llpp { }; llpp = ocaml-ng.ocamlPackages.callPackage ../applications/misc/llpp { };
@ -16393,7 +16391,7 @@ with pkgs;
qrcode = callPackage ../tools/graphics/qrcode {}; qrcode = callPackage ../tools/graphics/qrcode {};
qsampler = callPackage ../applications/audio/qsampler { }; qsampler = libsForQt5.callPackage ../applications/audio/qsampler { };
qscreenshot = callPackage ../applications/graphics/qscreenshot { qscreenshot = callPackage ../applications/graphics/qscreenshot {
qt = qt4; qt = qt4;