On Mon, Mar 07, 2022 at 07:00:56AM +0000, Dimitri Karamazov wrote:
> Ping
>
It works for me except that it doesn't seem compatible with my window
manager (x11/i3 port). This is unrelated to your port and easy to
workaround and/or fix later.
Latency setting was ignored and the default hardcoded one was huge and
unpleasant to play with. Added the necessary tweak to your diff, see
below.
There are also two more changes:
- non-blocking MIDI input was used with poll(2), but according to the
comments, the author intent seems to be to use blocking input.
- audio was using XRUN_SYNC, there's no other audio stream to
synchronize to, so this is not necessary (but breaks ^Z).
The remaining problem is that zynaddsubfx is addictive, but I see no
fix for it. Thanks for the update.
Does this diff look correct port-wise? OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/zynaddsubfx/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Makefile 8 Apr 2021 13:45:11 -0000 1.2
+++ Makefile 8 Mar 2022 15:34:19 -0000
@@ -5,7 +5,7 @@ ONLY_FOR_ARCHS= i386 amd64
COMMENT= synth capable of making a countless number of instruments
-DISTNAME= zynaddsubfx-3.0.5
+DISTNAME= zynaddsubfx-3.0.6
CATEGORIES= audio
@@ -16,8 +16,8 @@ MAINTAINER= Dimitri Karamazov <deserter6
# GPLv2+
PERMIT_PACKAGE= Yes
-WANTLIB+= ${COMPILER_LIBCXX} GL X11 c fftw3 lo m mxml portaudio
-WANTLIB+= z
+WANTLIB += ${COMPILER_LIBCXX} GL X11 c fftw3f lo m mxml sndio
+WANTLIB += z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zynaddsubfx/}
EXTRACT_SUFX= .tar.bz2
@@ -31,18 +31,19 @@ BUILD_DEPENDS= shells/bash-completion
RUN_DEPENDS= devel/desktop-file-utils \
x11/mruby-zest
-LIB_DEPENDS= math/fftw3 \
+LIB_DEPENDS= math/fftw3,float \
textproc/mxml \
- audio/liblo \
- audio/portaudio-svn
+ audio/liblo
-CONFIGURE_ARGS= -DPaEnable=ON \
- -DGuiModule=zest \
+CONFIGURE_ARGS= -DGuiModule=zest \
-DAlsaEnable=OFF \
+ -DDssiEnable=OFF \
-DJackEnable=OFF \
+ -DLashEnable=OFF \
-DOssEnable=OFF \
- -DDssiEnable=OFF \
- -DLashEnable=OFF
+ -DPaEnable=OFF \
+ -DSndioEnable=ON \
+ -DCompileTests=OFF
post-patch:
sed -i s,/usr/X11R6,${X11BASE}, ${WRKSRC}/src/CMakeLists.txt
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/zynaddsubfx/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 29 Mar 2021 19:51:31 -0000 1.1.1.1
+++ distinfo 8 Mar 2022 15:34:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (zynaddsubfx-3.0.5.tar.bz2) =
dEcyImgRSh4KxfKBrDegmnjnYae+YZmcr3kQAEl4n2M=
-SIZE (zynaddsubfx-3.0.5.tar.bz2) = 8141703
+SHA256 (zynaddsubfx-3.0.6.tar.bz2) =
y9Fgd49s8Uf5sEh3Ge3FGXoUBPRtfHv9ieFT8NjOca4=
+SIZE (zynaddsubfx-3.0.6.tar.bz2) = 10001014
Index: patches/patch-DPF_dgl_src_Window_cpp
===================================================================
RCS file:
/cvs/ports/audio/zynaddsubfx/patches/Attic/patch-DPF_dgl_src_Window_cpp,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-DPF_dgl_src_Window_cpp
--- patches/patch-DPF_dgl_src_Window_cpp 29 Mar 2021 19:51:31 -0000
1.1.1.1
+++ patches/patch-DPF_dgl_src_Window_cpp 8 Mar 2022 15:34:19 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-DPF_dgl_src_Window_cpp,v 1.1.1.1 2021/03/29 19:51:31 sthen Exp
$
-
-get_current_dir_name not available on OpenBSD
-
---- DPF/dgl/src/Window.cpp.orig Tue Feb 9 14:55:13 2021
-+++ DPF/dgl/src/Window.cpp Tue Feb 9 14:55:56 2021
-@@ -1016,7 +1016,7 @@ bool Window::openFileBrowser(const FileBrowserOptions&
-
- if (startDir.isEmpty())
- {
-- if (char* const dir_name = get_current_dir_name())
-+ if (char* const dir_name = getcwd(NULL,0))
- {
- startDir = dir_name;
- std::free(dir_name);
Index: patches/patch-DPF_dgl_src_sofd_libsofd_c
===================================================================
RCS file:
/cvs/ports/audio/zynaddsubfx/patches/patch-DPF_dgl_src_sofd_libsofd_c,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-DPF_dgl_src_sofd_libsofd_c
--- patches/patch-DPF_dgl_src_sofd_libsofd_c 29 Mar 2021 19:51:31 -0000
1.1.1.1
+++ patches/patch-DPF_dgl_src_sofd_libsofd_c 8 Mar 2022 15:34:19 -0000
@@ -2,17 +2,18 @@ $OpenBSD: patch-DPF_dgl_src_sofd_libsofd
mntent.h not available on OpenBSD
---- DPF/dgl/src/sofd/libsofd.c.orig Fri Oct 23 23:56:41 2015
-+++ DPF/dgl/src/sofd/libsofd.c Tue Feb 9 14:45:34 2021
+Index: DPF/dgl/src/sofd/libsofd.c
+--- DPF/dgl/src/sofd/libsofd.c.orig
++++ DPF/dgl/src/sofd/libsofd.c
@@ -338,7 +338,6 @@ const char *x_fib_recent_file(const char *appname) {
}
- #ifdef SOFD_HAVE_X11
+ #ifdef HAVE_X11
-#include <mntent.h>
#include <dirent.h>
#include <X11/Xlib.h>
-@@ -1770,6 +1769,7 @@ static const char *ignore_devices[] = {
+@@ -1793,6 +1792,7 @@ static const char *ignore_devices[] = {
"/dev/loop", "/dev/vn"
};
@@ -20,7 +21,7 @@ mntent.h not available on OpenBSD
static int check_mount (const char *mountpoint, const char *fs, const char
*device) {
size_t i;
if (!mountpoint || !fs || !device) return -1;
-@@ -1817,6 +1817,7 @@ static int read_mtab (Display *dpy, const char *mtab)
+@@ -1840,6 +1840,7 @@ static int read_mtab (Display *dpy, const char *mtab)
fclose (mt);
return found;
}
@@ -28,7 +29,7 @@ mntent.h not available on OpenBSD
static void populate_places (Display *dpy) {
char tmp[1024];
-@@ -1845,9 +1846,11 @@ static void populate_places (Display *dpy) {
+@@ -1868,9 +1869,11 @@ static void populate_places (Display *dpy) {
parse_gtk_bookmarks (dpy, _fib_cfg_custom_places);
}
Index: patches/patch-DPF_distrho_extra_Mutex_hpp
===================================================================
RCS file:
/cvs/ports/audio/zynaddsubfx/patches/patch-DPF_distrho_extra_Mutex_hpp,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-DPF_distrho_extra_Mutex_hpp
--- patches/patch-DPF_distrho_extra_Mutex_hpp 29 Mar 2021 19:51:31 -0000
1.1.1.1
+++ patches/patch-DPF_distrho_extra_Mutex_hpp 8 Mar 2022 15:34:19 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-DPF_distrho_extra_Mutex_
OpenBSD doesn't support pthread_condattr_setpshared
---- DPF/distrho/extra/Mutex.hpp.orig Sat Jul 25 18:05:19 2020
-+++ DPF/distrho/extra/Mutex.hpp Sat Jul 25 18:05:56 2020
-@@ -194,7 +194,9 @@ class Signal (public)
+Index: DPF/distrho/extra/Mutex.hpp
+--- DPF/distrho/extra/Mutex.hpp.orig
++++ DPF/distrho/extra/Mutex.hpp
+@@ -196,7 +196,9 @@ class Signal (public)
{
pthread_condattr_t cattr;
pthread_condattr_init(&cattr);
Index: patches/patch-cmake_BashCompletion_cmake
===================================================================
RCS file:
/cvs/ports/audio/zynaddsubfx/patches/patch-cmake_BashCompletion_cmake,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-cmake_BashCompletion_cmake
--- patches/patch-cmake_BashCompletion_cmake 29 Mar 2021 19:51:31 -0000
1.1.1.1
+++ patches/patch-cmake_BashCompletion_cmake 8 Mar 2022 15:34:19 -0000
@@ -2,8 +2,9 @@ $OpenBSD: patch-cmake_BashCompletion_cma
fix bash_completion install
---- cmake/BashCompletion.cmake.orig Sat Feb 23 21:13:37 2019
-+++ cmake/BashCompletion.cmake Thu Mar 11 18:06:57 2021
+Index: cmake/BashCompletion.cmake
+--- cmake/BashCompletion.cmake.orig
++++ cmake/BashCompletion.cmake
@@ -71,9 +71,9 @@ ELSE()
SET(BASHCOMP_SCRIPT
"${CMAKE_CURRENT_BINARY_DIR}/install_${SCRIPT_NAME}_completion.sh")
@@ -13,6 +14,6 @@ fix bash_completion install
set -e\n\
-BASHCOMP_PKG_PATH=\"${BASHCOMP_USER_PATH}\"\n\
+BASHCOMP_PKG_PATH=\"\$DESTDIR${BASHCOMP_USER_PATH}\"\n\
- if [ -w \"${BASHCOMP_PKG_PATH}\" ]; then\n\
+ if [ -n \"${BASHCOMP_PKG_PATH}\" ]; then\n\
BASHCOMP_PKG_PATH=\"${BASHCOMP_PKG_PATH}\"\n\
fi\n\
Index: patches/patch-src_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/audio/zynaddsubfx/patches/patch-src_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_CMakeLists_txt
--- patches/patch-src_CMakeLists_txt 29 Mar 2021 19:51:31 -0000 1.1.1.1
+++ patches/patch-src_CMakeLists_txt 8 Mar 2022 15:34:19 -0000
@@ -4,34 +4,23 @@ Remove -O3 flag
Add X11 libraries to LINK_PATH to fix build
OpenBSD doesn't have librt
---- src/CMakeLists.txt.orig Sat Feb 23 21:13:37 2019
-+++ src/CMakeLists.txt Sun Mar 21 20:27:19 2021
-@@ -208,7 +208,7 @@ set (BuildOptions_SSE
- )
+Index: src/CMakeLists.txt
+--- src/CMakeLists.txt.orig
++++ src/CMakeLists.txt
+@@ -261,7 +261,7 @@ set (BuildOptions_SSE
+ check_cxx_compiler_flag("${BuildOptions_SSE} -Werror" SUPPORT_SSE)
set (BuildOptionsBasic
- "-std=c++11 -Wno-unused-parameter -O3 -ffast-math -fomit-frame-pointer"
+ "-std=c++11 -Wno-unused-parameter -ffast-math -fomit-frame-pointer"
- CACHE STRING "basic X86 complier options"
+ CACHE STRING "basic X86 compiler options"
)
-
-@@ -450,9 +450,10 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zyn-version
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zyn-config.h.in
- ${CMAKE_CURRENT_BINARY_DIR}/zyn-config.h)
-
--link_directories(${AUDIO_LIBRARY_DIRS} ${ZLIB_LIBRARY_DIRS}
${FFTW_LIBRARY_DIRS} ${MXML_LIBRARY_DIRS} ${FLTK_LIBRARY_DIRS}
${NTK_LIBRARY_DIRS})
-+link_directories(${AUDIO_LIBRARY_DIRS} ${ZLIB_LIBRARY_DIRS}
${FFTW_LIBRARY_DIRS} ${MXML_LIBRARY_DIRS} ${FLTK_LIBRARY_DIRS}
${NTK_LIBRARY_DIRS} /usr/X11R6/lib)
+ STRING(APPEND BuildOptionsBasic " ${BuildOptions_ExtendedWarnings}")
+@@ -521,6 +521,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zyn-config.
+ link_directories(${AUDIO_LIBRARY_DIRS} ${ZLIB_LIBRARY_DIRS}
${FFTW3F_LIBRARY_DIRS} ${MXML_LIBRARY_DIRS} ${FLTK_LIBRARY_DIRS}
${NTK_LIBRARY_DIRS} ${X11_LIBRARY_DIRS})
include_directories(
+ /usr/X11R6/include
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)
-@@ -499,7 +500,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- elseif(APPLE)
- set(PTHREAD_LIBRARY pthread)
- else()
-- set(PLATFORM_LIBRARIES rt)
- set(PTHREAD_LIBRARY pthread)
- endif()
-
Index: patches/patch-src_Misc_Util_cpp
===================================================================
RCS file: /cvs/ports/audio/zynaddsubfx/patches/patch-src_Misc_Util_cpp,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_Misc_Util_cpp
--- patches/patch-src_Misc_Util_cpp 29 Mar 2021 19:51:31 -0000 1.1.1.1
+++ patches/patch-src_Misc_Util_cpp 8 Mar 2022 15:34:19 -0000
@@ -2,8 +2,9 @@ $OpenBSD: patch-src_Misc_Util_cpp,v 1.1.
OpenBSD doesn't support sched_setscheduler
---- src/Misc/Util.cpp.orig Sat Jul 25 18:00:34 2020
-+++ src/Misc/Util.cpp Sat Jul 25 18:02:04 2020
+Index: src/Misc/Util.cpp
+--- src/Misc/Util.cpp.orig
++++ src/Misc/Util.cpp
@@ -125,14 +125,6 @@ bool fileexists(const char *filename)
void set_realtime()
@@ -12,7 +13,7 @@ OpenBSD doesn't support sched_setschedul
- sched_param sc;
- sc.sched_priority = 60;
- //if you want get "sched_setscheduler undeclared" from compilation,
-- //you can safely remove the folowing line:
+- //you can safely remove the following line:
- sched_setscheduler(0, SCHED_FIFO, &sc);
- //if (err==0) printf("Real-time");
-#endif
Index: patches/patch-src_Nio_SndioEngine_cpp
===================================================================
RCS file: patches/patch-src_Nio_SndioEngine_cpp
diff -N patches/patch-src_Nio_SndioEngine_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Nio_SndioEngine_cpp 8 Mar 2022 15:34:19 -0000
@@ -0,0 +1,31 @@
+Index: src/Nio/SndioEngine.cpp
+--- src/Nio/SndioEngine.cpp.orig
++++ src/Nio/SndioEngine.cpp
+@@ -123,8 +123,7 @@ bool SndioEngine::openAudio()
+
+ sio_initpar(&audio.params);
+ audio.params.rate = synth.samplerate;
+- audio.params.appbufsz = audio.params.rate * 0.05;
+- audio.params.xrun = SIO_SYNC;
++ audio.params.appbufsz = synth.buffersize;
+
+ rc = sio_setpar(audio.handle, &audio.params);
+ if(rc != 1) {
+@@ -173,7 +172,7 @@ bool SndioEngine::openMidi()
+
+ midi.handle = NULL;
+
+- if((midi.handle = mio_open(MIO_PORTANY, MIO_IN, 1)) == NULL) {
++ if((midi.handle = mio_open(MIO_PORTANY, MIO_IN, 0)) == NULL) {
+ fprintf(stderr, "unable to open sndio midi device\n");
+ return false;
+ }
+@@ -265,7 +264,7 @@ void *SndioEngine::processMidi()
+ memset(buf, 0, sizeof(buf));
+ len = mio_read(midi.handle, buf, sizeof(buf));
+ if(len == 0) {
+- // since mio_read is non-blocking, this must indicate an error
++ // since mio_read is blocking, this must indicate an error
+ // so stop processing all MIDI
+ break;
+ } else if(len > sizeof(buf)) {
Index: patches/patch-src_Plugin_ZynAddSubFX_CMakeLists_txt
===================================================================
RCS file:
/cvs/ports/audio/zynaddsubfx/patches/Attic/patch-src_Plugin_ZynAddSubFX_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_Plugin_ZynAddSubFX_CMakeLists_txt
--- patches/patch-src_Plugin_ZynAddSubFX_CMakeLists_txt 29 Mar 2021 19:51:31
-0000 1.1.1.1
+++ patches/patch-src_Plugin_ZynAddSubFX_CMakeLists_txt 8 Mar 2022 15:34:19
-0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-src_Plugin_ZynAddSubFX_CMakeLists_txt,v 1.1.1.1 2021/03/29
19:51:31 sthen Exp $
-
-OpenBSD doesn't have librt
-
---- src/Plugin/ZynAddSubFX/CMakeLists.txt.orig Sun Jul 26 07:46:29 2020
-+++ src/Plugin/ZynAddSubFX/CMakeLists.txt Sun Jul 26 07:47:13 2020
-@@ -118,12 +118,12 @@ elseif(ZestGui)
- if(APPLE)
- set(PLATFORM_LIBRARIES)
- else()
-- set(PLATFORM_LIBRARIES X11 GL rt)
-+ set(PLATFORM_LIBRARIES X11 GL)
- endif()
- elseif(NtkGui OR FltkGui)
-- set(PLATFORM_LIBRARIES X11 rt)
-+ set(PLATFORM_LIBRARIES X11)
- else()
-- set(PLATFORM_LIBRARIES rt)
-+ set(PLATFORM_LIBRARIES)
- endif()
-
- if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
Index: patches/patch-src_Plugin_ZynAddSubFX_ZynAddSubFX_UI_ZEST_cpp
===================================================================
RCS file:
/cvs/ports/audio/zynaddsubfx/patches/patch-src_Plugin_ZynAddSubFX_ZynAddSubFX_UI_ZEST_cpp,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_Plugin_ZynAddSubFX_ZynAddSubFX_UI_ZEST_cpp
--- patches/patch-src_Plugin_ZynAddSubFX_ZynAddSubFX_UI_ZEST_cpp 29 Mar
2021 19:51:31 -0000 1.1.1.1
+++ patches/patch-src_Plugin_ZynAddSubFX_ZynAddSubFX_UI_ZEST_cpp 8 Mar
2022 15:34:19 -0000
@@ -5,7 +5,7 @@ set libzest.so location
Index: src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp
--- src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp.orig
+++ src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp
-@@ -64,6 +64,8 @@ class ZynAddSubFXUI : public UI (public)
+@@ -65,6 +65,8 @@ class ZynAddSubFXUI : public UI (public)
handle = dlopen("@loader_path/libzest.dylib", RTLD_NOW | RTLD_LOCAL);
if(!handle) // VST
handle = dlopen("@loader_path/../Resources/libzest.dylib",
RTLD_LAZY);
Index: patches/patch-src_globals_h
===================================================================
RCS file: /cvs/ports/audio/zynaddsubfx/patches/Attic/patch-src_globals_h,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_globals_h
--- patches/patch-src_globals_h 29 Mar 2021 19:51:31 -0000 1.1.1.1
+++ patches/patch-src_globals_h 8 Mar 2022 15:34:19 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_globals_h,v 1.1.1.1 2021/03/29 19:51:31 sthen Exp $
-
-OpenBSD supports std::complex
-
---- src/globals.h.orig Sat Jul 25 20:10:31 2020
-+++ src/globals.h Sat Jul 25 20:11:11 2020
-@@ -26,7 +26,7 @@
-
- //Forward Declarations
-
--#if defined(__APPLE__) || defined(__FreeBSD__)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
- #include <complex>
- #else
- namespace std {
Index: patches/patch-src_main_cpp
===================================================================
RCS file: /cvs/ports/audio/zynaddsubfx/patches/patch-src_main_cpp,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_main_cpp
--- patches/patch-src_main_cpp 29 Mar 2021 19:51:31 -0000 1.1.1.1
+++ patches/patch-src_main_cpp 8 Mar 2022 15:34:19 -0000
@@ -6,15 +6,15 @@ Look for zyn-fusion in out-of-path direc
Index: src/main.cpp
--- src/main.cpp.orig
+++ src/main.cpp
-@@ -707,12 +707,15 @@ int main(int argc, char *argv[])
+@@ -711,12 +711,15 @@ int main(int argc, char *argv[])
#endif
if(!noui) {
printf("[INFO] Launching Zyn-Fusion...\n");
-- const char *addr = middleware->getServerAddress();
+- char *addr = middleware->getServerAddress();
+ const char *raddr = middleware->getServerAddress();
-+ char *address;
++ char *address;
+ asprintf(&address, "osc.udp://127.0.0.1%s", strrchr(raddr, ':'));
-+ const char *addr = address;
++ const char *addr = address;
#ifndef WIN32
gui_pid = fork();
if(gui_pid == 0) {
@@ -24,7 +24,7 @@ Index: src/main.cpp
if(fusion_dir && *fusion_dir)
{
std::string fusion = fusion_dir;
-@@ -732,9 +735,7 @@ int main(int argc, char *argv[])
+@@ -736,9 +739,7 @@ int main(int argc, char *argv[])
exec_fusion(fusion.c_str());
}
}
@@ -35,3 +35,11 @@ Index: src/main.cpp
err(1,"Failed to launch Zyn-Fusion");
}
#else
+@@ -762,7 +763,6 @@ int main(int argc, char *argv[])
+ exit(1);
+ }
+ #endif
+- free(addr);
+ }
+ #endif
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/zynaddsubfx/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 29 Mar 2021 19:51:31 -0000 1.1.1.1
+++ pkg/PLIST 8 Mar 2022 15:34:20 -0000
@@ -51,9 +51,9 @@ share/bash-completion/completions/zynadd
share/doc/zynaddsubfx/
share/doc/zynaddsubfx/AUTHORS.txt
share/doc/zynaddsubfx/COPYING
-share/doc/zynaddsubfx/HISTORY.txt
share/doc/zynaddsubfx/README.adoc
share/pixmaps/
+share/pixmaps/zynaddsubfx.png
share/pixmaps/zynaddsubfx.svg
share/zynaddsubfx/banks/
share/zynaddsubfx/banks/Arpeggios/
@@ -479,6 +479,168 @@ share/zynaddsubfx/banks/Cormi_Sound/0157
share/zynaddsubfx/banks/Cormi_Sound/0158-patetico.xiz
share/zynaddsubfx/banks/Cormi_Sound/0159-Destino.xiz
share/zynaddsubfx/banks/Cormi_Sound/ReadMe.txt
+share/zynaddsubfx/banks/Cris Owl Alvarez/
+share/zynaddsubfx/banks/Cris Owl Alvarez/0001-hard fat lead.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0002-hard fat lead 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0003-hard fat lead 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0004-dist lead.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0005-scifi leadbass.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0006-terror leadbass.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0007-terror leadbass 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0008-terror leadbass 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0009-terror leadbass 4.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0010-terror leadbass 5.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0011-synth brass.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0012-synth brass 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0013-fantasy padkeys.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0014-fantasy padkeys 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0015-fantasy padkeys 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0016-fantasy piano.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0017-fantasy piano 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0018-fantasy bells.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0019-fantasy bells 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0020-fantasy organ.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0021-fantasy organ 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0022-ghost soft pad.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0023-goblin music toy.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0024-ambient choirs.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0025-ambient choirs 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0026-ambient choirs 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0027-resonant choirs.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0028-dark ambient choirs.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0029-dark ambient choirs 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0030-ambient pad.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0031-ambient pad 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0032-ambient pad 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0033-synth slow ocarina.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0034-ambient bells.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0035-ambient bells 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0036-ambient bells 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0037-ambient bells 4.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0038-ambient perc.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0039-ambient perc 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0040-ambient perc 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0041-ambient perc 4.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0042-ambient perc 5.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0043-ambient perc 6.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0044-ambient perc 7.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0045-ambient perc 8.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0046-ambient perc 9.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0047-post 80s lead.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0048-post 80s lead 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0049-post 80s lead 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0050-post 80s lead 4.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0051-broken post dx7.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0052-broken post dx7 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0053-broken post dx7 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0054-electric full pad.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0055-electric full pad 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0056-electric full pad 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0057-noisy pad.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0058-noisy pad 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0059-dark atmos pad.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0060-dark atmos pad 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0061-dark atmos pad 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0062-dark atmos pad 4.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0063-dark atmos pad 5.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0064-dark atmos pad 6.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0065-atmos perc.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0066-atmos perc 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0067-atmos perc 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0068-electro tom lead.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0069-electro tom lead 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0070-bell padkeys.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0071-bell padkeys 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0072-bell padkeys 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0073-jazz funk organ.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0074-jazz funk organ 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0075-jazz funk organ 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0076-modern basslead.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0077-modern basslead 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0078-modern basslead 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0079-EDM keys hit ensemble.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0080-EDM keys hit ensemble 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0081-EDM keys hit ensemble 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0082-EDM pluck keys.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0083-EDM pluck keys 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0084-EDM pluck keys 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0085-EDM pluck keys 4.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0086-EDM pluck keys 5.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0087-EDM pluck keys 6.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0088-arp generative pad.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0089-arp generative pad 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0090-arp generative pad 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0091-glass noisy pad.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0092-glass noisy pad 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0093-pad synth brass.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0094-pad synth brass 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0095-pad synth brass 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0096-pad synth brass 4.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0097-env filter pad.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0098-env filter pad 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0099-env filter pad 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0100-env filter pad 4.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0101-env filter pad 5.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0102-room organ.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0103-room organ 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0104-fuzzion synth keypiano.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0105-fuzzion synth keypiano 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0106-fuzzion synth keypiano 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0107-fuzzion synth keypiano 4.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0108-gafapasta snob club e_p_.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0109-gafapasta snob club e_p_ 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0110-gafapasta snob club e_p_ 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0111-gafapasta snob club e_p_ 4.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0112-big synth pad.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0113-big synth pad 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0114-muufeo organ.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0115-muufeo organ 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0116-keypiano synth.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0117-keypiano synth 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0118-post mellotron keychoirs.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0119-post mellotron keychoirs 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0120-funny acid lead.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0121-electric keys.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0122-electric keys 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0123-electric keys 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0124-soft ethereal e_p_.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0125-soft ethereal e_p_ 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0126-slow pad.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0127-slow pad 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0128-slow pad 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0129-FX raining bits.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0130-FX ufo computer_s room.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0131-FX heavy rain.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0132-FX binaural xperience.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0133-FX binaural xperience 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0134-FX dark ambient.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0135-FX dark ambient 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0136-FX dark ambient 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0137-FX flying missile.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0138-FX alien_s water cavern.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0139-FX videogame lasergun.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0140-FX videogame discovering scifi
treasure.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0141-FX videogame scifi gate
opening.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0142-FX hell_s bell.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0143-FX hell_s bell 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0144-FX videogame retro spaceship
scape.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0145-FX thunder.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0146-FX far bomb.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0147-FX gunshot.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0148-FX far gunshot.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0149-FX videogame super item.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0150-FX videogame super item 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0151-FX videogame super item 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0152-FX scifi hit.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0153-FX scifi hit 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0154-FX scifi hit 3.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0155-FX flying motorbike.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0156-FX scifi elevator brake.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0157-FX scifi gong.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0158-FX scifi gong 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0159-DRUMKIT toy drummer.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/0160-DRUMKIT toy drummer 2.xiz
+share/zynaddsubfx/banks/Cris Owl Alvarez/readme.txt
share/zynaddsubfx/banks/Drums/
share/zynaddsubfx/banks/Drums/0001-Drums Kit1.xiz
share/zynaddsubfx/banks/Dual/
@@ -634,6 +796,7 @@ share/zynaddsubfx/banks/Organ/0009-Organ
share/zynaddsubfx/banks/Organ/0010-Organ 10.xiz
share/zynaddsubfx/banks/Organ/0011-Organ 11.xiz
share/zynaddsubfx/banks/Organ/0012-Organ 12.xiz
+share/zynaddsubfx/banks/Organ/0013-Organ 13.xiz
share/zynaddsubfx/banks/Organ/0033-Cathedral Organ1.xiz
share/zynaddsubfx/banks/Organ/0034-Cathedral Organ2.xiz
share/zynaddsubfx/banks/Organ/0035-Cathedral Organ3.xiz
