From 873665024ebfaa761ee49b508a79db7178aeb778 Mon Sep 17 00:00:00 2001 From: davidovski Date: Sat, 4 Jun 2022 15:08:04 +0100 Subject: added gnupg --- .../zynaddsubfx-3.0.6-libzest_location.patch | 13 +++ .../zynaddsubfx-3.0.6-system_rtosc.patch | 92 ++++++++++++++++++++++ ...bfx-mruby-zest-build-3.0.6-cflags_ldflags.patch | 21 +++++ ...bfx-mruby-zest-build-3.0.6-devendor_rtosc.patch | 14 ++++ ...x-mruby-zest-build-3.0.6-libzest_location.patch | 13 +++ ...ubfx-mruby-zest-build-3.0.6-makefile_find.patch | 75 ++++++++++++++++++ ...uby-zest-build-3.0.6-system_wide_location.patch | 46 +++++++++++ skip/zynaddsubfx/zynaddsubfx.xibuild | 23 ++++++ 8 files changed, 297 insertions(+) create mode 100644 skip/zynaddsubfx/zynaddsubfx-3.0.6-libzest_location.patch create mode 100644 skip/zynaddsubfx/zynaddsubfx-3.0.6-system_rtosc.patch create mode 100644 skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-cflags_ldflags.patch create mode 100644 skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-devendor_rtosc.patch create mode 100644 skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-libzest_location.patch create mode 100644 skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-makefile_find.patch create mode 100644 skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-system_wide_location.patch create mode 100644 skip/zynaddsubfx/zynaddsubfx.xibuild (limited to 'skip/zynaddsubfx') diff --git a/skip/zynaddsubfx/zynaddsubfx-3.0.6-libzest_location.patch b/skip/zynaddsubfx/zynaddsubfx-3.0.6-libzest_location.patch new file mode 100644 index 0000000..ce14e67 --- /dev/null +++ b/skip/zynaddsubfx/zynaddsubfx-3.0.6-libzest_location.patch @@ -0,0 +1,13 @@ +diff --git i/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp w/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp +index 0829e889..010e1fac 100644 +--- i/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp ++++ w/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp +@@ -68,7 +68,7 @@ public: + #else + handle = dlopen("./libzest.so", RTLD_LAZY); + if(!handle) +- handle = dlopen("/opt/zyn-fusion/libzest.so", RTLD_LAZY); ++ handle = dlopen("/usr/lib/zynaddsubfx/libzest.so", RTLD_LAZY); + if(!handle) + handle = dlopen("libzest.so", RTLD_LAZY); + #endif diff --git a/skip/zynaddsubfx/zynaddsubfx-3.0.6-system_rtosc.patch b/skip/zynaddsubfx/zynaddsubfx-3.0.6-system_rtosc.patch new file mode 100644 index 0000000..799ff8e --- /dev/null +++ b/skip/zynaddsubfx/zynaddsubfx-3.0.6-system_rtosc.patch @@ -0,0 +1,92 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c708574..ef17dbd3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,24 +10,34 @@ if(DEFINED ZYN_DATADIR) + add_definitions(-DZYN_DATADIR="${ZYN_DATADIR}") + endif() + ++option(ZYN_SYSTEM_RTOSC "Use system provided librtosc and librtosc-cpp" OFF) ++ + #Include RTOSC +-if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt") +- message(STATUS "RTOSC NOT FOUND") +- message(STATUS "Attempting to checkout submodule") +- find_package(Git REQUIRED) +- execute_process(COMMAND git submodule update --init --recursive) ++if(ZYN_SYSTEM_RTOSC) ++ include(FindPkgConfig) ++ pkg_check_modules(RTOSC REQUIRED librtosc) ++ pkg_check_modules(RTOSC_CPP REQUIRED librtosc-cpp) ++ include_directories(${RTOSC_INCLUDE_DIR}) ++ message(STATUS "Found system provided librtosc and librtosc-cpp...") ++else() + if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt") +- message(FATAL_ERROR "FAILED TO CHECKOUT RTOSC\n" +- "please check file permissions and your network") ++ message(STATUS "RTOSC NOT FOUND") ++ message(STATUS "Attempting to checkout submodule") ++ find_package(Git REQUIRED) ++ execute_process(COMMAND git submodule update --init --recursive) ++ if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt") ++ message(FATAL_ERROR "FAILED TO CHECKOUT RTOSC\n" ++ "please check file permissions and your network") ++ endif() ++ else() ++ message(STATUS "Found Rtosc Submodule...") + endif() +-else() +- message(STATUS "Found Rtosc Submodule...") +-endif() + +-set(RTOSC_NO_INSTALL TRUE) +-include("rtosc/cmake/ColorMessage.cmake") +-add_subdirectory(rtosc) +-include_directories(rtosc/include) ++ set(RTOSC_NO_INSTALL TRUE) ++ include("rtosc/cmake/ColorMessage.cmake") ++ add_subdirectory(rtosc) ++ include_directories(rtosc/include) ++endif() + + enable_testing() + include(CTestConfig.cmake) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2900f4b7..8348df70 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -575,13 +575,27 @@ else() + set(PTHREAD_LIBRARY pthread) + endif() + +-target_link_libraries(zynaddsubfx_core +- ${ZLIB_LIBRARIES} +- ${FFTW3F_LIBRARIES} +- ${MXML_LIBRARIES} +- ${OS_LIBRARIES} +- ${PTHREAD_LIBRARY} +- rtosc rtosc-cpp) ++if(ZYN_SYSTEM_RTOSC) ++ target_link_libraries(zynaddsubfx_core ++ ${ZLIB_LIBRARIES} ++ ${FFTW3F_LIBRARIES} ++ ${MXML_LIBRARIES} ++ ${OS_LIBRARIES} ++ ${PTHREAD_LIBRARY} ++ ${RTOSC_LIBRARIES} ++ ${RTOSC_CPP_LIBRARIES} ++ ) ++else() ++ target_link_libraries(zynaddsubfx_core ++ ${ZLIB_LIBRARIES} ++ ${FFTW3F_LIBRARIES} ++ ${MXML_LIBRARIES} ++ ${OS_LIBRARIES} ++ ${PTHREAD_LIBRARY} ++ rtosc ++ rtosc-cpp ++ ) ++endif() + + if(IwyuErr) + message (STATUS "Include what you use: ${IwyuErr}") diff --git a/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-cflags_ldflags.patch b/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-cflags_ldflags.patch new file mode 100644 index 0000000..09dca6f --- /dev/null +++ b/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-cflags_ldflags.patch @@ -0,0 +1,21 @@ +diff --git i/Makefile w/Makefile +index 7bc3788..3af1cce 100644 +--- i/Makefile ++++ w/Makefile +@@ -16,10 +16,14 @@ linux: + $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -v mrbc | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \ + ./deps/libnanovg.a \ + src/osc-bridge/libosc-bridge.a \ +- `pkg-config --libs libuv` -lm -lX11 -lGL -lpthread ++ $(CFLAGS) \ ++ `pkg-config --libs libuv` -lm -lX11 -lGL -lpthread \ ++ $(LDFLAGS) + $(CC) test-libversion.c deps/pugl/pugl/pugl_x11.c \ ++ $(CFLAGS) \ + -DPUGL_HAVE_GL \ +- -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99 -Wno-trigraphs ++ -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99 -Wno-trigraphs \ ++ $(LDFLAGS) + + osx: deps/libuv.a + ruby ./rebuild-fcache.rb diff --git a/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-devendor_rtosc.patch b/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-devendor_rtosc.patch new file mode 100644 index 0000000..38e84e1 --- /dev/null +++ b/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-devendor_rtosc.patch @@ -0,0 +1,14 @@ +diff --git i/src/mruby-widget-lib/src/gem.c w/src/mruby-widget-lib/src/gem.c +index 8e3d721..7f200e3 100644 +--- i/src/mruby-widget-lib/src/gem.c ++++ w/src/mruby-widget-lib/src/gem.c +@@ -11,8 +11,8 @@ + #ifdef WIN32 + #include + #endif ++#include + #include "../../../deps/pugl/pugl/pugl.h" +-#include "../../../deps/rtosc/include/rtosc/rtosc.h" + #include "../../../src/osc-bridge/src/bridge.h" + #include "../../../deps/mruby-nanovg/src/gl_core.3.2.h" + diff --git a/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-libzest_location.patch b/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-libzest_location.patch new file mode 100644 index 0000000..26dad92 --- /dev/null +++ b/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-libzest_location.patch @@ -0,0 +1,13 @@ +diff --git i/test-libversion.c w/test-libversion.c +index 808c01f..a122585 100644 +--- i/test-libversion.c ++++ w/test-libversion.c +@@ -660,7 +660,7 @@ int main(int argc, char **argv) + if(!handle) + handle = dlopen("libzest.so", RTLD_LAZY); + if(!handle) +- handle = dlopen("/opt/zyn-fusion/libzest.so", RTLD_LAZY); ++ handle = dlopen("/usr/lib/zynaddsubfx/libzest.so", RTLD_LAZY); + #endif + if(!handle) { + printf("[ERROR] Cannot Open libzest.so\n"); diff --git a/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-makefile_find.patch b/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-makefile_find.patch new file mode 100644 index 0000000..d6e3a93 --- /dev/null +++ b/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-makefile_find.patch @@ -0,0 +1,75 @@ +From c1f5fcbad97c20b14a35e894477081d69519f6b0 Mon Sep 17 00:00:00 2001 +From: David Runge +Date: Sat, 21 May 2022 13:19:48 +0200 +Subject: [PATCH] Use find internals instead of piping into grep + +Makefile: +Use GNU find internals (e.g. `-iname`, `-exec` and conditionals) instead +of piping into multiple instances of grep. +Simplify line counting by using wc from find. +--- + Makefile | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/Makefile b/Makefile +index 7bc3788c..a78568e9 100644 +--- a/Makefile ++++ b/Makefile +@@ -13,7 +13,7 @@ linux: + # force rebuilding all code that depends on hotloading. + touch src/mruby-widget-lib/src/api.c + cd mruby && $(HOTLOADING) MRUBY_CONFIG=../build_config.rb rake +- $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -v mrbc | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \ ++ $(CC) -shared -o libzest.so `find mruby/build/host -type f \( -not -iwholename "*mrbc*" -a -not -iwholename "*bin*" -a -iname "*.o" \)` \ + ./deps/libnanovg.a \ + src/osc-bridge/libosc-bridge.a \ + `pkg-config --libs libuv` -lm -lX11 -lGL -lpthread +@@ -30,7 +30,7 @@ osx: deps/libuv.a + cd deps/pugl && python2 ./waf + cd src/osc-bridge && CFLAGS="-I ../../deps/libuv/include " make lib + cd mruby && MRUBY_CONFIG=../build_config.rb rake +- $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -v mrbc | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \ ++ $(CC) -shared -o libzest.so `find mruby/build/host -type f \( -not -iwholename "*mrbc*" -a -not -iwholename "*bin*" -a -iname "*.o" \)` ./deps/libnanovg.a \ + ./deps/libnanovg.a \ + src/osc-bridge/libosc-bridge.a \ + ./deps/libuv/.libs/libuv.a -lm -framework OpenGL -lpthread +@@ -41,7 +41,7 @@ windows: buildpuglwin deps/libuv-win.a + $(AR) rc deps/libnanovg.a deps/nanovg/src/*.o + cd src/osc-bridge && CFLAGS="-mstackrealign -I ../../deps/libuv/include " make lib + cd mruby && WINDOWS=1 MRUBY_CONFIG=../build_config.rb rake +- $(CC) -mstackrealign -shared -o libzest.dll -static-libgcc `find mruby/build/w64 -type f | grep -e "\.o$$" | grep -v bin` \ ++ $(CC) -mstackrealign -shared -o libzest.dll -static-libgcc `find mruby/build/w64 -type f \( -not -iwholename "*mrbc*" -a -not -iwholename "*bin*" -a -iname "*.o" \)` \ + ./deps/libnanovg.a \ + src/osc-bridge/libosc-bridge.a \ + ./deps/libuv-win.a \ +@@ -98,21 +98,21 @@ stats: + @echo 'mruby-qml-parse commits: ' `cd src/mruby-qml-parse && git log --oneline | wc -l` + @echo 'mruby-qml-spawn commits: ' `cd src/mruby-qml-spawn && git log --oneline | wc -l` + @echo 'osc-bridge commits: ' `cd src/osc-bridge && git log --oneline | wc -l` +- @echo 'number of qml files:' `find src/ -type f | grep -e qml$$ | wc -l` +- @echo 'number of ruby files:' `find src/ -type f | grep -e rb$$ | wc -l` +- @echo 'number of c files:' `find src/ -type f | grep -e c$$ | wc -l` +- @echo 'number of header files:' `find src/ -type f | grep -e h$$ | wc -l` ++ @echo 'number of qml files:' `find src/ -type f -iname "*.qml" | wc -l` ++ @echo 'number of ruby files:' `find src/ -type f -iname "*.rb" | wc -l` ++ @echo 'number of c files:' `find src/ -type f -iname "*.c" | wc -l` ++ @echo 'number of header files:' `find src/ -type f -iname "*.h" | wc -l` + @echo 'lines of OSC schema:' `wc -l src/osc-bridge/schema/test.json` + @echo 'lines of qml:' +- @wc -l `find src/ -type f | grep qml$$` | tail -n 1 ++ @`find src/ -type f -iname "*.qml" -exec wc -l {} +` | tail -n 1 + @echo 'lines of ruby:' +- @wc -l `find src/ -type f | grep -e rb$$ | grep -v fcache` | tail -n 1 ++ @`find src/ -type f \( -iname "*.rb" -a -not -iwholename "*fcache*" \) -exec wc -l {} +` | tail -n 1 + @echo 'lines of c source:' +- @wc -l `find src/ -type f | grep -e c$$` | tail -n 1 ++ @`find src/ -type f -iname "*.c" -exec wc -l {} +` | tail -n 1 + @echo 'lines of c header:' +- @wc -l `find src/ -type f | grep -e h$$` | tail -n 1 ++ @`find src/ -type f -iname "*.h" -exec wc -l {} +` | tail -n 1 + @echo 'total lines of code:' +- @wc -l `find src/ -type f | grep -Ee "(qml|rb|c|h)$$" | grep -v fcache` | tail -n 1 ++ @`find src/ -type f \( -iname "*.qml" -o -iname "*.rb" -o -iname "*.c" -o -iname "*.h" -a -not -iwholename "*fcache*" \) -exec wc -l {} +` | tail -n 1 + + + verbose: ## Compile mruby with --trace diff --git a/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-system_wide_location.patch b/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-system_wide_location.patch new file mode 100644 index 0000000..101ea3b --- /dev/null +++ b/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-system_wide_location.patch @@ -0,0 +1,46 @@ +diff --git i/src/mruby-widget-lib/mrblib/script.rb w/src/mruby-widget-lib/mrblib/script.rb +index 2d3e7fc..4dbd3c7 100644 +--- i/src/mruby-widget-lib/mrblib/script.rb ++++ w/src/mruby-widget-lib/mrblib/script.rb +@@ -160,13 +160,13 @@ class ZRunner + search = @search_path + search ||= "" + font_error = false +- sans = [search + "font/Roboto-Regular.ttf", "deps/nanovg/example/Roboto-Regular.ttf"] ++ sans = ["/usr/share/fonts/TTF/Roboto-Regular.ttf", search + "font/Roboto-Regular.ttf", "deps/nanovg/example/Roboto-Regular.ttf"] + if(@vg.create_font('sans', sans[0]) == -1 && @vg.create_font('sans', sans[1]) == -1) + GL::debug "[ERROR] could not find sans font" + font_error = true + end + +- bold = [search + "font/Roboto-Bold.ttf", "deps/nanovg/example/Roboto-Bold.ttf"] ++ bold = ["/usr/share/fonts/TTF/Roboto-Bold.ttf", search + "font/Roboto-Bold.ttf", "deps/nanovg/example/Roboto-Bold.ttf"] + if(@vg.create_font('bold', bold[0]) == -1 && @vg.create_font('bold', bold[1]) == -1) + GL::debug "[ERROR] could not find bold font" + font_error = true +diff --git i/src/mruby-widget-lib/src/api.c w/src/mruby-widget-lib/src/api.c +index 6949413..1118717 100644 +--- i/src/mruby-widget-lib/src/api.c ++++ w/src/mruby-widget-lib/src/api.c +@@ -110,7 +110,7 @@ zest_open(char *address) + if(strstr(path, "libzest")) + strstr(path, "libzest")[0] = 0; + char path2[256]; +- snprintf(path2, sizeof(path2), "%s%s", path, "./qml/MainWindow.qml"); ++ snprintf(path2, sizeof(path2), "%s%s", path, "../../share/zynaddsubfx/qml/MainWindow.qml"); + FILE *f = fopen(path2, "r"); + if(f) { + printf("[INFO:Zyn] Found Assets at %s\n", path); +diff --git i/src/osc-bridge/src/bridge.c w/src/osc-bridge/src/bridge.c +index f87c849..6405bbb 100644 +--- i/src/osc-bridge/src/bridge.c ++++ w/src/osc-bridge/src/bridge.c +@@ -431,7 +431,7 @@ schema_t br_get_schema(bridge_t *br, uri_t uri) + schema_t sch; + + //printf("[debug] loading json file\n"); +- FILE *f = fopen("schema/test.json", "r"); ++ FILE *f = fopen("/usr/share/zynaddsubfx/schema/test.json", "r"); + if(!f && br->search_path) { + char tmp[256]; + snprintf(tmp, sizeof(tmp), "%s%s", br->search_path, "schema/test.json"); diff --git a/skip/zynaddsubfx/zynaddsubfx.xibuild b/skip/zynaddsubfx/zynaddsubfx.xibuild new file mode 100644 index 0000000..6362364 --- /dev/null +++ b/skip/zynaddsubfx/zynaddsubfx.xibuild @@ -0,0 +1,23 @@ +#!/bin/sh + +NAME="zynaddsubfx" +DESC="Opensource software synthesizer capable of making a countless number of instruments." + +MAKEDEPS="cmake jack fltk portaudio mxml sndio bash-completion liblo" +DEPS="less " + +PKG_VER=3.0.6 +SOURCE="https://downloads.sourceforge.net/project/zynaddsubfx/zynaddsubfx/$PKG_VER/zynaddsubfx-$PKG_VER.tar.bz2" +ADDITIONAL=" +" + +build () { + cmake -B build \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib + cmake --build build +} + +package () { + DESTDIR="$PKG_DEST" cmake --install build +} -- cgit v1.2.1