diff options
| author | root <root@alpha.trunkmasters.com> | 2026-06-04 16:24:49 -0500 |
|---|---|---|
| committer | root <root@alpha.trunkmasters.com> | 2026-06-04 16:24:49 -0500 |
| commit | a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7 (patch) | |
| tree | 0c52bbae1c242fbc296bd650fcd1167685f81492 /media-sound/zynaddsubfx | |
| parent | bfd9c39e4712ebdb442d4ca0673061faed1e70e1 (diff) | |
| download | baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.tar.gz baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.tar.xz baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.zip | |
Adding metadata
Diffstat (limited to 'media-sound/zynaddsubfx')
17 files changed, 0 insertions, 1167 deletions
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest deleted file mode 100644 index 748fcac41684..000000000000 --- a/media-sound/zynaddsubfx/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST zyn-fusion-ui-src-3.0.6.tar.bz2 5266884 BLAKE2B d9715c319bfd313792f550e12a47939dec665eda6ef395f8bb7a175b11f0922a4037428f99dc95fe749c40074ce8976fa9d257b6bc1e8f1feb63ca943c3bdd76 SHA512 7f195cf6a193376160441863d725383640bc75ad0c21b8ef7786da67a42fe014be103e3c3d9c29c83ffc3d78b9e11a4031a6b3922d457a336d184228c16077cd -DIST zynaddsubfx-3.0.6.tar.bz2 10001014 BLAKE2B 4adbeffb9bc0bd77bf81a6734f5c26fc676426e644e27cebb8e54e8d74d869c0e1b468782cd1a64aacef8f9b788d434a8d30a194944650eea03c4fd146ee7bf7 SHA512 86311f00d97e20c7eb22a46c99736c56765ed9737e728ef380a324e4a92c731086ed74f5d7bfeae104b690ab1ee1b40bfb8f240bc4c46f8afd47308ec48cbcea diff --git a/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-cflags_ldflags.patch b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-cflags_ldflags.patch deleted file mode 100644 index 005b1733e5e2..000000000000 --- a/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-cflags_ldflags.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- 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/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-libzest_location.patch b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-libzest_location.patch deleted file mode 100644 index 4652217bf331..000000000000 --- a/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-libzest_location.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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("@GENTOO_PORTAGE_EPREFIX@/usr/@GENTOO_LIBDIR@/zynaddsubfx/libzest.so", RTLD_LAZY); - #endif - if(!handle) { - printf("[ERROR] Cannot Open libzest.so\n"); diff --git a/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-makefile_find.patch b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-makefile_find.patch deleted file mode 100644 index 77cc47913f57..000000000000 --- a/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-makefile_find.patch +++ /dev/null @@ -1,69 +0,0 @@ -From c1f5fcbad97c20b14a35e894477081d69519f6b0 Mon Sep 17 00:00:00 2001 -From: David Runge <dave@sleepmap.de> -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. ---- 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/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-system_wide_location.patch b/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-system_wide_location.patch deleted file mode 100644 index 3001e08754dc..000000000000 --- a/media-sound/zynaddsubfx/files/zyn-fusion-ui-3.0.6-system_wide_location.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- 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/roboto/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/roboto/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 ---- 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); ---- 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/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-DPF-cmake4.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-DPF-cmake4.patch deleted file mode 100644 index cb7784d78681..000000000000 --- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-DPF-cmake4.patch +++ /dev/null @@ -1,25 +0,0 @@ -Source: https://github.com/DISTRHO/DPF/commit/157692d557ef3a608e95c6b40fb115d42fcdba01 - -From 157692d557ef3a608e95c6b40fb115d42fcdba01 Mon Sep 17 00:00:00 2001 -From: falkTX <falktx@falktx.com> -Date: Thu, 7 Aug 2025 22:34:46 +0200 -Subject: [PATCH] Fix some CMake details, be quiet if pkg-config not found - -Signed-off-by: falkTX <falktx@falktx.com> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 02c7707de..5f0d7b97d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -4,7 +4,7 @@ - # - # SPDX-License-Identifier: ISC - --cmake_minimum_required(VERSION 3.7) -+cmake_minimum_required(VERSION 3.8...3.31) - - project(DPF) - diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-cmake4.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-cmake4.patch deleted file mode 100644 index 4e0912a00561..000000000000 --- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-cmake4.patch +++ /dev/null @@ -1,85 +0,0 @@ -Source: -https://github.com/zynaddsubfx/zynaddsubfx/commit/ffe9ca1375168dd86c974dbe7c0264fce393150e -https://github.com/zynaddsubfx/zynaddsubfx/commit/730ae35c763d3e65849932f6207ed349a59a96c9 - -From ffe9ca1375168dd86c974dbe7c0264fce393150e Mon Sep 17 00:00:00 2001 -From: Johannes Lorenz <j.git@lorenz-ho.me> -Date: Sun, 29 Dec 2024 03:22:44 +0100 -Subject: [PATCH] CMake cleanup - -* Raise CMake minimum version to 3.5 (due to deprecation warnings) ---- - CMakeLists.txt | 3 +- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e678d939c..9bae0b40d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,9 +1,10 @@ --cmake_minimum_required(VERSION 3.0) -+cmake_minimum_required(VERSION 3.5) - set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") - project(zynaddsubfx) - set(VERSION_MAJOR "3") - set(VERSION_MINOR "0") - set(VERSION_REVISION "6") -+cmake_policy(SET CMP0072 NEW) - - #Set data directory, if any - if(DEFINED ZYN_DATADIR) - -From 730ae35c763d3e65849932f6207ed349a59a96c9 Mon Sep 17 00:00:00 2001 -From: Johannes Lorenz <j.git@lorenz-ho.me> -Date: Sat, 22 Feb 2025 16:46:31 +0100 -Subject: [PATCH] Various CMake updates/fixes - -* Raise CMake minimum version to prevent warnings -* Add missing FFTW include dirs (not used on Linux because they are - often in default paths like `/usr/include`) -* Link against rt library only if it exists ---- - CMakeLists.txt | 2 +- - src/CMakeLists.txt | 2 +- - src/Tests/CMakeLists.txt | 5 ++++- - 3 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9bae0b40d..451c59575 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.5) -+cmake_minimum_required(VERSION 3.10) - set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") - project(zynaddsubfx) - set(VERSION_MAJOR "3") -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index c6fa46c99..9b7923f38 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -351,7 +351,7 @@ list(APPEND AUDIO_LIBRARY_DIRS ${LIBLO_LIBRARY_DIRS}) - message(STATUS "Compiling with liblo") - - # other include directories --include_directories(${ZLIB_INCLUDE_DIRS} ${MXML_INCLUDE_DIRS}) -+include_directories(${ZLIB_INCLUDE_DIRS} ${MXML_INCLUDE_DIRS} ${FFTW3F_INCLUDE_DIRS}) - include_directories(${CMAKE_BINARY_DIR}/src) # for zyn-version.h ... - - if(NOT ${X11_X11_LIB} STREQUAL "") -diff --git a/src/Tests/CMakeLists.txt b/src/Tests/CMakeLists.txt -index 2a113d2cb..f55f77a9f 100644 ---- a/src/Tests/CMakeLists.txt -+++ b/src/Tests/CMakeLists.txt -@@ -71,7 +71,10 @@ if(NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")) - ${PLATFORM_LIBRARIES}) - - add_executable(ins-test InstrumentStats.cpp) -- target_link_libraries(ins-test ${test_lib} rt) -+ target_link_libraries(ins-test ${test_lib}) -+ if(HAVE_LIBRT) -+ target_link_libraries(ins-test rt) -+ endif() - - if(LIBLO_FOUND) - quick_test(PortChecker lo-server zynaddsubfx_core zynaddsubfx_nio diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-docs.patch deleted file mode 100644 index 0db30ed2395c..000000000000 --- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-docs.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -35,9 +35,6 @@ include(CTestConfig.cmake) - add_subdirectory(src) - add_subdirectory(doc) # Doxygen only - --install(FILES AUTHORS.txt COPYING README.adoc -- DESTINATION share/doc/zynaddsubfx -- ) - install(FILES zynaddsubfx-jack-multi.desktop zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop zynaddsubfx-oss.desktop - DESTINATION share/applications) - install(FILES zynaddsubfx.svg diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-fix-Wnonnull-warning.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-fix-Wnonnull-warning.patch deleted file mode 100644 index f975a9540192..000000000000 --- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-fix-Wnonnull-warning.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 42e91c8ee3a06d8a29562706b6b2346de99aca81 Mon Sep 17 00:00:00 2001 -From: fundamental <mark.d.mccurry@gmail.com> -Date: Wed, 4 May 2022 17:09:58 -0400 -Subject: [PATCH] Fix strstr() null warning - -Comment out part of incomplete dispatch matcher -Resolve #46 ---- - src/dispatch.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/dispatch.c b/src/dispatch.c -index 4a6c14a..0ce3359 100644 ---- a/src/dispatch.c -+++ b/src/dispatch.c -@@ -287,10 +287,12 @@ bool rtosc_match_partial(const char *a, const char *b) - return true; - else - return false; -+ /* - } else if(type == 4) { - //extract substring - const char *sub=NULL; - return strstr(a,sub); -+ */ - } else if(type == RTOSC_MATCH_OPTIONS || type == 6) { - return false; - } else if(type == RTOSC_MATCH_ENUMERATED) { diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-libzest_location.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-libzest_location.patch deleted file mode 100644 index 93c6694f8ceb..000000000000 --- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-libzest_location.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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("@GENTOO_PORTAGE_EPREFIX@/usr/@GENTOO_LIBDIR@/zynaddsubfx/libzest.so", RTLD_LAZY); - if(!handle) - handle = dlopen("libzest.so", RTLD_LAZY); - #endif diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-mxml4.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-mxml4.patch deleted file mode 100644 index 2f9818f39405..000000000000 --- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-mxml4.patch +++ /dev/null @@ -1,310 +0,0 @@ -Source: https://github.com/zynaddsubfx/zynaddsubfx/pull/315 - -From 2806817938776ecb5e2f0dd7a80649625ccde561 Mon Sep 17 00:00:00 2001 -From: Johannes Lorenz <j.git@lorenz-ho.me> -Date: Sun, 12 Jan 2025 15:33:11 +0100 -Subject: [PATCH 1/5] Support MXML4, if available - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 396f28fee..555825d42 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -33,7 +33,10 @@ if(PKG_CONFIG_FOUND AND NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")) - pkg_check_modules(NTK_IMAGES ntk_images) - - pkg_check_modules(FFTW3F REQUIRED fftw3f) -- pkg_check_modules(MXML REQUIRED mxml) -+ pkg_check_modules(MXML mxml4) -+ if(NOT MXML_FOUND) -+ pkg_check_modules(MXML REQUIRED mxml) -+ endif() - - pkg_search_module(LASH lash-1.0) - mark_as_advanced(LASH_LIBRARIES) -diff --git a/src/Misc/XMLwrapper.cpp b/src/Misc/XMLwrapper.cpp -index e1c55a495..b34c843cc 100644 ---- a/src/Misc/XMLwrapper.cpp -+++ b/src/Misc/XMLwrapper.cpp -@@ -32,9 +32,30 @@ namespace zyn { - int xml_k = 0; - bool verbose = false; - --const char *XMLwrapper_whitespace_callback(mxml_node_t *node, int where) -+#if MXML_MAJOR_VERSION <= 3 -+// Mimic datatypes present in mxml4 for compatibility -+typedef int mxml_ws_t; -+typedef int mxml_descend_t; -+// Mimic typenames present in mxml4 for compatibility -+constexpr int MXML_DESCEND_ALL = MXML_DESCEND; -+constexpr int MXML_DESCEND_NONE = MXML_NO_DESCEND; -+constexpr int MXML_TYPE_OPAQUE = MXML_OPAQUE; -+constexpr int MXML_TYPE_ELEMENT = MXML_ELEMENT; -+constexpr int MXML_TYPE_TEXT = MXML_TEXT; -+#endif -+ -+const char *XMLwrapper_whitespace_callback(void*, mxml_node_t *node, mxml_ws_t where) - { -+#if MXML_MAJOR_VERSION >= 4 -+ // New node types in MXL4 -+ if(mxmlGetDirective(node)) // "?xml" directive -+ return "\n"; -+ else if(mxmlGetDeclaration(node)) // "!DOCTYPE" declaration -+ return nullptr; -+#endif -+ - const char *name = mxmlGetElement(node); -+ assert(name); - - if((where == MXML_WS_BEFORE_OPEN) && (!strcmp(name, "?xml"))) - return NULL; -@@ -67,13 +88,21 @@ const char *XMLwrapper_whitespace_callback(mxml_node_t *node, int where) - return 0; - } - -+#if MXML_MAJOR_VERSION <= 3 -+// Wrapper, because int and mxml_ws_t are different types -+inline const char *XMLwrapper_whitespace_callback(mxml_node_t *node, int where) -+{ -+ return XMLwrapper_whitespace_callback(nullptr, node, where); -+} -+#endif -+ - //temporary const overload of mxmlFindElement - const mxml_node_t *mxmlFindElement(const mxml_node_t *node, - const mxml_node_t *top, - const char *name, - const char *attr, - const char *value, -- int descend) -+ mxml_descend_t descend) - { - return const_cast<const mxml_node_t *>(mxmlFindElement( - const_cast<mxml_node_t *>(node), -@@ -92,16 +121,22 @@ XMLwrapper::XMLwrapper() - minimal = true; - SaveFullXml=false; - -- node = tree = mxmlNewElement(MXML_NO_PARENT, -- "?xml version=\"1.0f\" encoding=\"UTF-8\"?"); -+ node = tree = mxmlNewXML("1.0"); -+ assert(node); - /* for mxml 2.1f (and older) - tree=mxmlNewElement(MXML_NO_PARENT,"?xml"); - mxmlElementSetAttr(tree,"version","1.0f"); - mxmlElementSetAttr(tree,"encoding","UTF-8"); - */ - -- mxml_node_t *doctype = mxmlNewElement(tree, "!DOCTYPE"); -- mxmlElementSetAttr(doctype, "ZynAddSubFX-data", NULL); -+ mxml_node_t *doctype = -+#if MXML_MAJOR_VERSION <= 3 -+ mxmlNewElement(tree, "!DOCTYPE"); -+ mxmlElementSetAttr(doctype, "ZynAddSubFX-data", NULL); -+#else -+ mxmlNewDeclaration(tree, "DOCTYPE ZynAddSubFX-data"); -+#endif -+ assert(doctype); - - node = root = addparams("ZynAddSubFX-data", 4, - "version-major", stringFrom<int>( -@@ -164,7 +199,7 @@ bool XMLwrapper::hasPadSynth() const - "INFORMATION", - NULL, - NULL, -- MXML_DESCEND); -+ MXML_DESCEND_ALL); - - mxml_node_t *parameter = mxmlFindElement(tmp, - tmp, -@@ -204,7 +239,15 @@ char *XMLwrapper::getXMLdata() const - { - xml_k = 0; - -+#if MXML_MAJOR_VERSION <= 3 - char *xmldata = mxmlSaveAllocString(tree, XMLwrapper_whitespace_callback); -+#else -+ mxml_options_t *options = mxmlOptionsNew(); -+ mxmlOptionsSetWhitespaceCallback(options, XMLwrapper_whitespace_callback, /*cbdata*/nullptr); -+ char *xmldata = mxmlSaveAllocString(tree, options); -+ mxmlOptionsDelete(options); -+#endif -+ - - return xmldata; - } -@@ -317,8 +360,15 @@ int XMLwrapper::loadXMLfile(const string &filename) - if(xmldata == NULL) - return -1; //the file could not be loaded or uncompressed - -+#if MXML_MAJOR_VERSION <= 3 - root = tree = mxmlLoadString(NULL, trimLeadingWhite( -- xmldata), MXML_OPAQUE_CALLBACK); -+ xmldata), MXML_OPAQUE_CALLBACK); -+#else -+ mxml_options_t *options = mxmlOptionsNew(); -+ mxmlOptionsSetTypeValue(options, MXML_TYPE_OPAQUE); -+ root = tree = mxmlLoadString(NULL, options, trimLeadingWhite(xmldata)); -+ mxmlOptionsDelete(options); -+#endif - - delete[] xmldata; - -@@ -330,7 +380,7 @@ int XMLwrapper::loadXMLfile(const string &filename) - "ZynAddSubFX-data", - NULL, - NULL, -- MXML_DESCEND); -+ MXML_DESCEND_ALL); - if(root == NULL) - return -3; //the XML doesn't embbed zynaddsubfx data - -@@ -384,8 +434,15 @@ bool XMLwrapper::putXMLdata(const char *xmldata) - if(xmldata == NULL) - return false; - -+#if MXML_MAJOR_VERSION <= 3 - root = tree = mxmlLoadString(NULL, trimLeadingWhite( -- xmldata), MXML_OPAQUE_CALLBACK); -+ xmldata), MXML_OPAQUE_CALLBACK); -+#else -+ mxml_options_t *options = mxmlOptionsNew(); -+ mxmlOptionsSetTypeValue(options, MXML_TYPE_OPAQUE); -+ root = tree = mxmlLoadString(NULL, options, trimLeadingWhite(xmldata)); -+ mxmlOptionsDelete(options); -+#endif - if(tree == NULL) - return false; - -@@ -394,7 +451,7 @@ bool XMLwrapper::putXMLdata(const char *xmldata) - "ZynAddSubFX-data", - NULL, - NULL, -- MXML_DESCEND); -+ MXML_DESCEND_ALL); - if(root == NULL) - return false; - -@@ -531,11 +588,11 @@ void XMLwrapper::getparstr(const string &name, char *par, int maxstrlen) const - return; - if(mxmlGetFirstChild(tmp) == NULL) - return; -- if(mxmlGetType(mxmlGetFirstChild(tmp)) == MXML_OPAQUE) { -+ if(mxmlGetType(mxmlGetFirstChild(tmp)) == MXML_TYPE_OPAQUE) { - snprintf(par, maxstrlen, "%s", mxmlGetOpaque(mxmlGetFirstChild(tmp))); - return; - } -- if((mxmlGetType(mxmlGetFirstChild(tmp)) == MXML_TEXT) -+ if((mxmlGetType(mxmlGetFirstChild(tmp)) == MXML_TYPE_TEXT) - && (mxmlGetFirstChild(tmp) != NULL)) { - snprintf(par, maxstrlen, "%s", mxmlGetText(mxmlGetFirstChild(tmp),NULL)); - return; -@@ -555,11 +612,11 @@ string XMLwrapper::getparstr(const string &name, - if((tmp == NULL) || (mxmlGetFirstChild(tmp) == NULL)) - return defaultpar; - -- if(mxmlGetType(mxmlGetFirstChild(tmp)) == MXML_OPAQUE -+ if(mxmlGetType(mxmlGetFirstChild(tmp)) == MXML_TYPE_OPAQUE - && (mxmlGetOpaque(mxmlGetFirstChild(tmp)) != NULL)) - return mxmlGetOpaque(mxmlGetFirstChild(tmp)); - -- if(mxmlGetType(mxmlGetFirstChild(tmp)) == MXML_TEXT -+ if(mxmlGetType(mxmlGetFirstChild(tmp)) == MXML_TYPE_TEXT - && (mxmlGetText(mxmlGetFirstChild(tmp),NULL) != NULL)) - return mxmlGetText(mxmlGetFirstChild(tmp),NULL); - -@@ -684,8 +741,8 @@ std::vector<XmlNode> XMLwrapper::getBranch(void) const - std::vector<XmlNode> res; - mxml_node_t *current = mxmlGetFirstChild(node); - while(current) { -- if(mxmlGetType(current) == MXML_ELEMENT) { --#if MXML_MAJOR_VERSION == 3 -+ if(mxmlGetType(current) == MXML_TYPE_ELEMENT) { -+#if MXML_MAJOR_VERSION >= 3 - XmlNode n(mxmlGetElement(current)); - int count = mxmlElementGetAttrCount(current); - const char *name; -@@ -705,7 +762,7 @@ std::vector<XmlNode> XMLwrapper::getBranch(void) const - #endif - res.push_back(n); - } -- current = mxmlWalkNext(current, node, MXML_NO_DESCEND); -+ current = mxmlWalkNext(current, node, MXML_DESCEND_NONE); - } - return res; - } -diff --git a/src/Tests/MessageTest.cpp b/src/Tests/MessageTest.cpp -index ef7558dfa..f6810a2f1 100644 ---- a/src/Tests/MessageTest.cpp -+++ b/src/Tests/MessageTest.cpp -@@ -105,22 +105,16 @@ class MessageTest - mw->transmitMsg("/presets/copy", "s", "/part0/kit0/adpars/VoicePar0/FMSmp/"); - - TS_ASSERT_EQUAL_STR("Poscilgen", mw->getPresetsStore().clipboard.type.c_str()); -- // a regex would be better here... -- // hopefully, mxml will not change its whitespace behavior -- assert_non_null(strstr(mw->getPresetsStore().clipboard.data.c_str(), "<par name=\"base_function_par\" value=\"32\" />"), -- "base_function_par at right value", __LINE__); -- -- /* // better test this without string comparison: -+ //Use XMLwrapper to validate copied XML - { - XMLwrapper xml; - bool couldPutXml = xml.putXMLdata(mw->getPresetsStore().clipboard.data.c_str()); - TS_ASSERT(couldPutXml); -+ xml.enterbranch("Poscilgen"); - unsigned char copiedBasefuncPar = xml.getpar127("base_function_par", 0); -- TS_ASSERT_EQUALS(copiedBasefuncPar, 32); -- }*/ -- -- //printf("clipboard type: %s\n",mw->getPresetsStore().clipboard.type.c_str()); -- //printf("clipboard data:\n%s\n",mw->getPresetsStore().clipboard.data.c_str()); -+ xml.exitbranch(); -+ TS_ASSERT_EQUAL_INT(+copiedBasefuncPar, 32); -+ } - - TS_ASSERT_EQUAL_INT(osc_dst.Pbasefuncpar, 64); - TS_ASSERT_EQUAL_INT(osc_oth.Pbasefuncpar, 64); -diff --git a/src/Tests/PluginTest.cpp b/src/Tests/PluginTest.cpp -index 665a7311f..dd0c4214a 100644 ---- a/src/Tests/PluginTest.cpp -+++ b/src/Tests/PluginTest.cpp -@@ -15,6 +15,7 @@ - #include <cstdlib> - #include <iostream> - #include <fstream> -+#include <regex> - #include <string> - #include "../Misc/MiddleWare.h" - #include "../Misc/Master.h" -@@ -228,12 +229,30 @@ class PluginTest - - void testLoadSave(void) - { -+ // Do the load/save - const string fname = string(SOURCE_DIR) + "/guitar-adnote.xmz"; -- const string fdata = loadfile(fname); -+ string fdata = loadfile(fname); - char *result = NULL; - master[0]->putalldata((char*)fdata.c_str()); - int res = master[0]->getalldata(&result); - -+ // Fixup, because d44dc9b corrupted guitar-adnote.xmz: -+ // Replace "1.0f" with "1.0" and "UTF-8" with "utf-8" in `<?xml...` -+ fdata = std::regex_replace(fdata, -+ std::regex(R"(<\?xml version="1\.0f" encoding="UTF-8"\?>)"), -+ R"(<?xml version="1.0" encoding="utf-8"?>)"); -+ -+ // Fixups, because guitar-adnote.xmz was saved with MXML3 -+#if MXML_MAJOR_VERSION >= 4 -+ // guitar-adnote has tags ending on " />" - we remove the space -+ fdata = std::regex_replace(fdata, std::regex(" />"), "/>"); -+ // Remove trailing newline -+ if (fdata.size() >= 1 && fdata[fdata.size() - 1] == '\n') { -+ fdata.pop_back(); -+ } -+#endif -+ -+ // Checks - TS_ASSERT_EQUAL_INT((int)(fdata.length()+1), res); - TS_ASSERT(fdata == result); - if(fdata != result) diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-rtosc-cmake4.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-rtosc-cmake4.patch deleted file mode 100644 index b3e20e93d7f4..000000000000 --- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-rtosc-cmake4.patch +++ /dev/null @@ -1,21 +0,0 @@ -Source: https://github.com/fundamental/rtosc/commit/1310ac63ba205d6f986b26050ab875bb1f7347e8 - -From 1310ac63ba205d6f986b26050ab875bb1f7347e8 Mon Sep 17 00:00:00 2001 -From: Johannes Lorenz <j.git@lorenz-ho.me> -Date: Mon, 21 Jul 2025 02:05:03 +0200 -Subject: [PATCH] Update CMake to at least 3.10 - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 40a5464..f3b2feb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.8) -+cmake_minimum_required(VERSION 3.10) - project(RTOSC) - - set(VERSION_MAJOR 0) diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-stdint.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-stdint.patch deleted file mode 100644 index 3c1bd7937810..000000000000 --- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-stdint.patch +++ /dev/null @@ -1,121 +0,0 @@ ---- zynaddsubfx-3.0.6/src/Params/ADnoteParameters.h -+++ zynaddsubfx-3.0.6.mod/src/Params/ADnoteParameters.h -@@ -16,6 +16,7 @@ - - #include "../globals.h" - #include "PresetsArray.h" -+#include <cstdint> - - namespace zyn { - ---- zynaddsubfx-3.0.6/src/Params/Controller.h -+++ zynaddsubfx-3.0.6.mod/src/Params/Controller.h -@@ -17,6 +17,7 @@ - - #include <stdint.h> - #include "../globals.h" -+#include <cstdint> - - namespace zyn { - ---- zynaddsubfx-3.0.6/src/Params/EnvelopeParams.h -+++ zynaddsubfx-3.0.6.mod/src/Params/EnvelopeParams.h -@@ -17,6 +17,7 @@ - #include "../globals.h" - #include "../Misc/XMLwrapper.h" - #include "Presets.h" -+#include <cstdint> - - namespace zyn { - ---- zynaddsubfx-3.0.6/src/Params/FilterParams.h -+++ zynaddsubfx-3.0.6.mod/src/Params/FilterParams.h -@@ -17,6 +17,7 @@ - #include "../globals.h" - #include "../Misc/XMLwrapper.h" - #include "PresetsArray.h" -+#include <cstdint> - - namespace zyn { - ---- zynaddsubfx-3.0.6/src/Params/LFOParams.h -+++ zynaddsubfx-3.0.6.mod/src/Params/LFOParams.h -@@ -17,6 +17,7 @@ - #include <Misc/Time.h> - #include <rtosc/ports.h> - #include "Presets.h" -+#include <cstdint> - - #define LFO_SINE 0 - #define LFO_TRIANGLE 1 ---- zynaddsubfx-3.0.6/src/Params/PADnoteParameters.h -+++ zynaddsubfx-3.0.6.mod/src/Params/PADnoteParameters.h -@@ -19,7 +19,7 @@ - #include "Presets.h" - #include <string> - #include <functional> -- -+#include <cstdint> - namespace zyn { - - /** ---- zynaddsubfx-3.0.6/src/Params/SUBnoteParameters.h -+++ zynaddsubfx-3.0.6.mod/src/Params/SUBnoteParameters.h -@@ -17,6 +17,7 @@ - #include <stdint.h> - #include "../globals.h" - #include "Presets.h" -+#include <cstdint> - - namespace zyn { - ---- zynaddsubfx-3.0.6.old/src/Misc/Bank.cpp -+++ zynaddsubfx-3.0.6/src/Misc/Bank.cpp -@@ -17,6 +17,7 @@ - #include <cstring> - #include <cstdio> - #include <cstdlib> -+#include <cstdint> - #include <dirent.h> - #include <sys/stat.h> - #include <algorithm> ---- zynaddsubfx-3.0.6.old/src/Misc/Bank.h -+++ zynaddsubfx-3.0.6/src/Misc/Bank.h -@@ -16,6 +16,7 @@ - - #include <string> - #include <vector> -+#include <cstdint> - #include "../globals.h" - #include "Config.h" - ---- zynaddsubfx-3.0.6.old/src/Nio/InMgr.cpp -+++ zynaddsubfx-3.0.6/src/Nio/InMgr.cpp -@@ -17,6 +17,7 @@ - #include "../Misc/MiddleWare.h" - #include <rtosc/thread-link.h> - #include <iostream> -+#include <cstdint> - using namespace std; - - extern zyn::MiddleWare *middleware; ---- zynaddsubfx-3.0.6.old/src/Nio/MidiIn.cpp -+++ zynaddsubfx-3.0.6/src/Nio/MidiIn.cpp -@@ -15,6 +15,7 @@ - #include "../globals.h" - #include "InMgr.h" - #include <string.h> -+#include <cstdint> - - namespace zyn { - ---- zynaddsubfx-3.0.6.old/src/Nio/MidiIn.h -+++ zynaddsubfx-3.0.6/src/Nio/MidiIn.h -@@ -17,6 +17,7 @@ - #define MIDI_IN_H - - #include "Engine.h" -+#include <cstdint> - - namespace zyn { - diff --git a/media-sound/zynaddsubfx/metadata.xml b/media-sound/zynaddsubfx/metadata.xml deleted file mode 100644 index 52c14139a51e..000000000000 --- a/media-sound/zynaddsubfx/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>proaudio@gentoo.org</email> - <name>Gentoo ProAudio Project</name> - </maintainer> - <use> - <flag name="dssi">Enable support for DSSI Soft Synth Interface</flag> - </use> - <upstream> - <remote-id type="sourceforge">zynaddsubfx</remote-id> - </upstream> -</pkgmetadata> diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r6.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r6.ebuild deleted file mode 100644 index 658f0da2aa09..000000000000 --- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r6.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic prefix toolchain-funcs - -DESCRIPTION="Software synthesizer capable of making a countless number of instruments" -HOMEPAGE="https://zynaddsubfx.sourceforge.net/" - -SRC_URI=" - https://downloads.sourceforge.net/zynaddsubfx/${P}.tar.bz2 - https://downloads.sourceforge.net/zynaddsubfx/zyn-fusion-ui-src-${PV}.tar.bz2 -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="+alsa doc dssi jack lash portaudio" -REQUIRED_USE="|| ( alsa jack portaudio )" - -DEPEND=" - dev-libs/mxml:0 - media-libs/liblo - sci-libs/fftw:3.0 - virtual/zlib:= - virtual/opengl - alsa? ( media-libs/alsa-lib ) - doc? ( dev-texlive/texlive-fontutils ) - dssi? ( media-libs/dssi ) - jack? ( virtual/jack ) - lash? ( media-sound/lash ) - portaudio? ( media-libs/portaudio ) -" -RDEPEND=" - ${DEPEND} - media-fonts/roboto -" -BDEPEND=" - dev-lang/ruby:* - virtual/pkgconfig - doc? ( app-text/doxygen ) -" - -PATCHES=( - "${FILESDIR}"/${P}-docs.patch - "${FILESDIR}"/${P}-stdint.patch - "${FILESDIR}"/${P}-libzest_location.patch -) -ZYN_FUSION_UI_PATCHES=( - "${FILESDIR}"/zyn-fusion-ui-${PV}-cflags_ldflags.patch - "${FILESDIR}"/zyn-fusion-ui-${PV}-libzest_location.patch - "${FILESDIR}"/zyn-fusion-ui-${PV}-makefile_find.patch - "${FILESDIR}"/zyn-fusion-ui-${PV}-system_wide_location.patch -) - -DOCS=( AUTHORS.txt NEWS.txt README.adoc ) - -src_prepare() { - cmake_src_prepare - - if ! use dssi; then - sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die - fi - if ! use jack; then - sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die - fi - if ! use lash; then - sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die - fi - if ! use portaudio; then - sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die - fi - - # FIXME upstream: sandbox error - sed -i -e '/add_subdirectory(bash-completion)/d' doc/CMakeLists.txt || die - - cd ../zyn-fusion-ui-src-${PV} - eapply "${ZYN_FUSION_UI_PATCHES[@]}" - - sed -i "s|@GENTOO_LIBDIR@|$(get_libdir)|" \ - "${S}/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp" \ - test-libversion.c || die - - eprefixify \ - "${S}/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp" \ - test-libversion.c -} - -src_configure() { - append-cxxflags -std=c++11 - - local mycmakeargs=( - -DPluginLibDir=$(get_libdir) - -DGuiModule=zest - -DDefaultInput=jack - -DDefaultOutput=jack - $(cmake_use_find_package alsa Alsa) - $(cmake_use_find_package doc Doxygen) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use doc && cmake_src_compile doc - emake \ - LD="$(tc-getCC)" \ - -C ../zyn-fusion-ui-src-${PV} -} - -src_install() { - use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) - cmake_src_install - - cd ../zyn-fusion-ui-src-${PV} - newbin zest zyn-fusion - insinto /usr/$(get_libdir)/${PN} - doins libzest.so - insinto /usr/share/${PN}/qml - doins -r src/mruby-zest/{example,qml}/*.qml - insinto /usr/share/${PN}/schema - doins src/osc-bridge/schema/test.json -} diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r7.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r7.ebuild deleted file mode 100644 index 98d365f68a79..000000000000 --- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r7.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic prefix toolchain-funcs - -DESCRIPTION="Software synthesizer capable of making a countless number of instruments" -HOMEPAGE="https://zynaddsubfx.sourceforge.net/" - -SRC_URI=" - https://downloads.sourceforge.net/zynaddsubfx/${P}.tar.bz2 - https://downloads.sourceforge.net/zynaddsubfx/zyn-fusion-ui-src-${PV}.tar.bz2 -" -S_ZYN_FUSION_UI="${WORKDIR}"/zyn-fusion-ui-src-${PV} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="+alsa doc dssi jack lash portaudio" -REQUIRED_USE="|| ( alsa jack portaudio )" - -DEPEND=" - dev-libs/mxml:0 - media-libs/liblo - sci-libs/fftw:3.0 - virtual/zlib:= - virtual/opengl - alsa? ( media-libs/alsa-lib ) - doc? ( dev-texlive/texlive-fontutils ) - dssi? ( media-libs/dssi ) - jack? ( virtual/jack ) - lash? ( media-sound/lash ) - portaudio? ( media-libs/portaudio ) -" -RDEPEND=" - ${DEPEND} - media-fonts/roboto -" -BDEPEND=" - dev-lang/ruby:* - virtual/pkgconfig - doc? ( app-text/doxygen[dot] ) -" - -PATCHES=( - "${FILESDIR}"/${P}-docs.patch - "${FILESDIR}"/${P}-stdint.patch - "${FILESDIR}"/${P}-libzest_location.patch - "${FILESDIR}"/${P}-cmake4.patch # bug 957633, in git master -) -ZYN_FUSION_UI_PATCHES=( - "${FILESDIR}"/zyn-fusion-ui-${PV}-cflags_ldflags.patch - "${FILESDIR}"/zyn-fusion-ui-${PV}-libzest_location.patch - "${FILESDIR}"/zyn-fusion-ui-${PV}-makefile_find.patch - "${FILESDIR}"/zyn-fusion-ui-${PV}-system_wide_location.patch -) - -DOCS=( AUTHORS.txt NEWS.txt README.adoc ) - -src_prepare() { - pushd DPF > /dev/null || die - eapply "${FILESDIR}"/${P}-DPF-cmake4.patch # bug 957633, in git master - popd > /dev/null || die - - pushd rtosc > /dev/null || die - eapply "${FILESDIR}"/${P}-rtosc-cmake4.patch # bug 957633, in git master - eapply "${FILESDIR}"/${P}-fix-Wnonnull-warning.patch # in git master - popd > /dev/null || die - - pushd "${S_ZYN_FUSION_UI}" > /dev/null || die - eapply "${ZYN_FUSION_UI_PATCHES[@]}" - popd > /dev/null || die - - cmake_src_prepare - - if ! use dssi; then - sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die - fi - if ! use jack; then - sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die - fi - if ! use lash; then - sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die - fi - if ! use portaudio; then - sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die - fi - - # FIXME upstream: sandbox error - cmake_comment_add_subdirectory -f doc bash-completion - - sed -i "s|@GENTOO_LIBDIR@|$(get_libdir)|" \ - src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp \ - "${S_ZYN_FUSION_UI}"/test-libversion.c || die - - eprefixify \ - src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp \ - "${S_ZYN_FUSION_UI}"/test-libversion.c -} - -src_configure() { - append-cxxflags -std=c++11 - - local mycmakeargs=( - -DPluginLibDir=$(get_libdir) - -DGuiModule=zest - -DDefaultInput=jack - -DDefaultOutput=jack - $(cmake_use_find_package alsa Alsa) - $(cmake_use_find_package doc Doxygen) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use doc && cmake_src_compile doc - emake \ - LD="$(tc-getCC)" \ - -C "${S_ZYN_FUSION_UI}" -} - -src_install() { - use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) - cmake_src_install - - pushd "${S_ZYN_FUSION_UI}" > /dev/null || die - newbin zest zyn-fusion - insinto /usr/$(get_libdir)/${PN} - doins libzest.so - insinto /usr/share/${PN}/qml - doins -r src/mruby-zest/{example,qml}/*.qml - insinto /usr/share/${PN}/schema - doins src/osc-bridge/schema/test.json - popd > /dev/null || die -} diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r8.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r8.ebuild deleted file mode 100644 index a1771aedcd93..000000000000 --- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r8.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic prefix toolchain-funcs - -DESCRIPTION="Software synthesizer capable of making a countless number of instruments" -HOMEPAGE="https://zynaddsubfx.sourceforge.net/" - -SRC_URI=" - https://downloads.sourceforge.net/zynaddsubfx/${P}.tar.bz2 - https://downloads.sourceforge.net/zynaddsubfx/zyn-fusion-ui-src-${PV}.tar.bz2 -" -S_ZYN_FUSION_UI="${WORKDIR}"/zyn-fusion-ui-src-${PV} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="+alsa doc dssi jack lash portaudio" -REQUIRED_USE="|| ( alsa jack portaudio )" - -DEPEND=" - dev-libs/mxml:4 - media-libs/liblo - sci-libs/fftw:3.0 - virtual/zlib:= - virtual/opengl - alsa? ( media-libs/alsa-lib ) - doc? ( dev-texlive/texlive-fontutils ) - dssi? ( media-libs/dssi ) - jack? ( virtual/jack ) - lash? ( media-sound/lash ) - portaudio? ( media-libs/portaudio ) -" -RDEPEND=" - ${DEPEND} - media-fonts/roboto -" -BDEPEND=" - dev-lang/ruby:* - virtual/pkgconfig - doc? ( app-text/doxygen[dot] ) -" - -PATCHES=( - "${FILESDIR}"/${P}-docs.patch - "${FILESDIR}"/${P}-stdint.patch - "${FILESDIR}"/${P}-libzest_location.patch - "${FILESDIR}"/${P}-cmake4.patch # bug 957633, in git master - "${FILESDIR}"/${P}-mxml4.patch # bug 930526, in git master -) -ZYN_FUSION_UI_PATCHES=( - "${FILESDIR}"/zyn-fusion-ui-${PV}-cflags_ldflags.patch - "${FILESDIR}"/zyn-fusion-ui-${PV}-libzest_location.patch - "${FILESDIR}"/zyn-fusion-ui-${PV}-makefile_find.patch - "${FILESDIR}"/zyn-fusion-ui-${PV}-system_wide_location.patch -) - -DOCS=( AUTHORS.txt NEWS.txt README.adoc ) - -src_prepare() { - pushd DPF > /dev/null || die - eapply "${FILESDIR}"/${P}-DPF-cmake4.patch # bug 957633, in git master - popd > /dev/null || die - - pushd rtosc > /dev/null || die - eapply "${FILESDIR}"/${P}-rtosc-cmake4.patch # bug 957633, in git master - eapply "${FILESDIR}"/${P}-fix-Wnonnull-warning.patch # in git master - popd > /dev/null || die - - pushd "${S_ZYN_FUSION_UI}" > /dev/null || die - eapply "${ZYN_FUSION_UI_PATCHES[@]}" - popd > /dev/null || die - - cmake_src_prepare - - if ! use dssi; then - sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die - fi - if ! use jack; then - sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die - fi - if ! use lash; then - sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die - fi - if ! use portaudio; then - sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die - fi - - # FIXME upstream: sandbox error - cmake_comment_add_subdirectory -f doc bash-completion - - sed -i "s|@GENTOO_LIBDIR@|$(get_libdir)|" \ - src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp \ - "${S_ZYN_FUSION_UI}"/test-libversion.c || die - - eprefixify \ - src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp \ - "${S_ZYN_FUSION_UI}"/test-libversion.c -} - -src_configure() { - append-cxxflags -std=c++11 - - local mycmakeargs=( - -DPluginLibDir=$(get_libdir) - -DGuiModule=zest - -DDefaultInput=jack - -DDefaultOutput=jack - $(cmake_use_find_package alsa Alsa) - $(cmake_use_find_package doc Doxygen) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use doc && cmake_src_compile doc - emake \ - LD="$(tc-getCC)" \ - -C "${S_ZYN_FUSION_UI}" -} - -src_install() { - use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) - cmake_src_install - - pushd "${S_ZYN_FUSION_UI}" > /dev/null || die - newbin zest zyn-fusion - insinto /usr/$(get_libdir)/${PN} - doins libzest.so - insinto /usr/share/${PN}/qml - doins -r src/mruby-zest/{example,qml}/*.qml - insinto /usr/share/${PN}/schema - doins src/osc-bridge/schema/test.json - popd > /dev/null || die -} |
