From d78da70f9ecacf153c18447c5af29f494ce7f954 Mon Sep 17 00:00:00 2001 From: Artur Sinila Date: Mon, 5 Jul 2021 03:44:08 +0300 Subject: [PATCH 1/2] common/build-style/: enable running tests in parallel --- common/build-style/cmake.sh | 6 +++++- common/build-style/configure.sh | 6 +++++- common/build-style/gnu-configure.sh | 6 +++++- common/build-style/gnu-makefile.sh | 6 +++++- common/build-style/perl-module.sh | 6 +++++- common/environment/setup/sourcepkg.sh | 3 ++- 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh index 401dabad31c8..c7ffd16fee21 100644 --- a/common/build-style/cmake.sh +++ b/common/build-style/cmake.sh @@ -113,7 +113,11 @@ do_check() { : ${make_check_target:=test} - ${make_cmd} ${make_check_args} ${make_check_target} + if [ -z "$disable_parallel_check" ]; then + ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target} + else + ${make_cmd} ${make_check_args} ${make_check_target} + fi } do_install() { diff --git a/common/build-style/configure.sh b/common/build-style/configure.sh index 0963fc347934..b846a1a77572 100644 --- a/common/build-style/configure.sh +++ b/common/build-style/configure.sh @@ -29,7 +29,11 @@ do_check() { : ${make_cmd:=make} : ${make_check_target:=check} - ${make_cmd} ${make_check_args} ${make_check_target} + if [ -z "$disable_parallel_check" ]; then + ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target} + else + ${make_cmd} ${make_check_args} ${make_check_target} + fi } do_install() { diff --git a/common/build-style/gnu-configure.sh b/common/build-style/gnu-configure.sh index 8121136cd121..b09de442b05b 100644 --- a/common/build-style/gnu-configure.sh +++ b/common/build-style/gnu-configure.sh @@ -30,7 +30,11 @@ do_check() { : ${make_cmd:=make} : ${make_check_target:=check} - ${make_cmd} ${make_check_args} ${make_check_target} + if [ -z "$disable_parallel_check" ]; then + ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target} + else + ${make_cmd} ${make_check_args} ${make_check_target} + fi } do_install() { diff --git a/common/build-style/gnu-makefile.sh b/common/build-style/gnu-makefile.sh index d7ea148fc483..0f7afa7d3695 100644 --- a/common/build-style/gnu-makefile.sh +++ b/common/build-style/gnu-makefile.sh @@ -30,7 +30,11 @@ do_check() { : ${make_cmd:=make} : ${make_check_target:=check} - ${make_cmd} ${make_check_args} ${make_check_target} + if [ -z "$disable_parallel_check" ]; then + ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target} + else + ${make_cmd} ${make_check_args} ${make_check_target} + fi } do_install() { diff --git a/common/build-style/perl-module.sh b/common/build-style/perl-module.sh index b9a01b13cfa9..d47945b33d36 100644 --- a/common/build-style/perl-module.sh +++ b/common/build-style/perl-module.sh @@ -79,7 +79,11 @@ do_check() { : ${make_cmd:=make} : ${make_check_target:=test} - ${make_cmd} ${make_check_args} ${make_check_target} + if [ -z "$disable_parallel_check" ]; then + ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target} + else + ${make_cmd} ${make_check_args} ${make_check_target} + fi } do_install() { diff --git a/common/environment/setup/sourcepkg.sh b/common/environment/setup/sourcepkg.sh index bc06f745b78a..1fd541f1e715 100644 --- a/common/environment/setup/sourcepkg.sh +++ b/common/environment/setup/sourcepkg.sh @@ -13,7 +13,8 @@ unset -v cmake_builddir meson_builddir unset -v meson_crossfile unset -v gemspec unset -v go_import_path go_package go_mod_mode -unset -v patch_args disable_parallel_build keep_libtool_archives make_use_env +unset -v patch_args disable_parallel_build disable_parallel_check +unset -v keep_libtool_archives make_use_env unset -v reverts subpackages makedepends hostmakedepends checkdepends depends restricted unset -v nopie build_options build_options_default bootstrap repository reverts unset -v CFLAGS CXXFLAGS FFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH From 457c2e1c11f054fb47280416c5a3cfeb3284ea65 Mon Sep 17 00:00:00 2001 From: Paper Date: Sat, 20 Mar 2021 23:19:47 +0100 Subject: [PATCH 2/2] New package: lsp-plugins-1.1.30 --- .../00-makefile-test-remove-cflags.patch | 12 + srcpkgs/lsp-plugins/patches/01-musl.patch | 104 ++ .../lsp-plugins/patches/02-make-verbose.patch | 1127 +++++++++++++++++ srcpkgs/lsp-plugins/template | 25 + 4 files changed, 1268 insertions(+) create mode 100644 srcpkgs/lsp-plugins/patches/00-makefile-test-remove-cflags.patch create mode 100644 srcpkgs/lsp-plugins/patches/01-musl.patch create mode 100644 srcpkgs/lsp-plugins/patches/02-make-verbose.patch create mode 100644 srcpkgs/lsp-plugins/template diff --git a/srcpkgs/lsp-plugins/patches/00-makefile-test-remove-cflags.patch b/srcpkgs/lsp-plugins/patches/00-makefile-test-remove-cflags.patch new file mode 100644 index 000000000000..fd82f25d4a25 --- /dev/null +++ b/srcpkgs/lsp-plugins/patches/00-makefile-test-remove-cflags.patch @@ -0,0 +1,12 @@ +https://github.com/void-linux/void-packages/pull/29932#discussion_r605695858 +--- a/Makefile ++++ b/Makefile +@@ -108,8 +108,6 @@ trace: export EXE_FLAGS += -g3 + trace: compile + + test: OBJDIR = $(TESTDIR) +-test: export CFLAGS += -O2 -DLSP_TESTING -DLSP_TRACE -g3 -fstack-protector +-test: export CXXFLAGS += -O2 -DLSP_TESTING -DLSP_TRACE -g3 -fstack-protector + test: export EXE_TEST_FLAGS += -g3 + test: export MAKE_OPTS += LSP_TESTING=1 + test: export BUILD_MODULES = jack diff --git a/srcpkgs/lsp-plugins/patches/01-musl.patch b/srcpkgs/lsp-plugins/patches/01-musl.patch new file mode 100644 index 000000000000..de8c1ca275c3 --- /dev/null +++ b/srcpkgs/lsp-plugins/patches/01-musl.patch @@ -0,0 +1,104 @@ +https://github.com/sadko4u/lsp-plugins/pull/198 +diff --git a/include/data/cvector.h b/include/data/cvector.h +index eccc94a..17fe119 100644 +--- a/include/data/cvector.h ++++ b/include/data/cvector.h +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + #define CVECTOR_GROW 16 + +diff --git a/include/test/main/executor.h b/include/test/main/executor.h +index 0faf73f..b37cbf2 100644 +--- a/include/test/main/executor.h ++++ b/include/test/main/executor.h +@@ -633,7 +633,7 @@ namespace lsp + } + #endif /* PLATFORM_WINDOWS */ + +-#ifdef PLATFORM_LINUX ++#if defined(PLATFORM_LINUX) && defined(__GLIBC__) + void TestExecutor::start_memcheck(test::Test *v) + { + if (!pCfg->mtrace) +diff --git a/include/test/main/types.h b/include/test/main/types.h +index ef15800..c833379 100644 +--- a/include/test/main/types.h ++++ b/include/test/main/types.h +@@ -42,7 +42,7 @@ + #include + #endif /* PLATFORM_UNIX_COMPATIBLE */ + +-#ifdef PLATFORM_LINUX ++#if defined(PLATFORM_LINUX) && defined(__GLIBC__) + #include + #endif /* PLATFORM_LINUX */ + +diff --git a/include/testing/mtest/3d/common/X11Renderer.h b/include/testing/mtest/3d/common/X11Renderer.h +index e8ec205..f0a51e2 100644 +--- a/include/testing/mtest/3d/common/X11Renderer.h ++++ b/include/testing/mtest/3d/common/X11Renderer.h +@@ -30,7 +30,7 @@ + #include + #include + #include +-#include ++#include + + #include + #include +diff --git a/src/testing/mtest/3d/boolean3d.cpp b/src/testing/mtest/3d/boolean3d.cpp +index 636dce1..f92c63e 100644 +--- a/src/testing/mtest/3d/boolean3d.cpp ++++ b/src/testing/mtest/3d/boolean3d.cpp +@@ -41,7 +41,7 @@ + #include + #include + #include +-#include ++#include + + //#define TEST_DEBUG + +diff --git a/src/testing/mtest/3d/bsp_context.cpp b/src/testing/mtest/3d/bsp_context.cpp +index de54427..ea9ab36 100644 +--- a/src/testing/mtest/3d/bsp_context.cpp ++++ b/src/testing/mtest/3d/bsp_context.cpp +@@ -39,7 +39,7 @@ + #include + #include + #include +-#include ++#include + + //#define TEST_DEBUG + +diff --git a/src/testing/mtest/3d/reflections3d.cpp b/src/testing/mtest/3d/reflections3d.cpp +index e250444..367f86c 100644 +--- a/src/testing/mtest/3d/reflections3d.cpp ++++ b/src/testing/mtest/3d/reflections3d.cpp +@@ -39,7 +39,7 @@ + #include + #include + #include +-#include ++#include + + //#define TEST_DEBUG + +diff --git a/src/ui/ws/x11/X11Display.cpp b/src/ui/ws/x11/X11Display.cpp +index d85db51..1bf7ff2 100644 +--- a/src/ui/ws/x11/X11Display.cpp ++++ b/src/ui/ws/x11/X11Display.cpp +@@ -23,7 +23,7 @@ + + #ifdef USE_X11_DISPLAY + +-#include ++#include + #include + #include + diff --git a/srcpkgs/lsp-plugins/patches/02-make-verbose.patch b/srcpkgs/lsp-plugins/patches/02-make-verbose.patch new file mode 100644 index 000000000000..2b490704ec39 --- /dev/null +++ b/srcpkgs/lsp-plugins/patches/02-make-verbose.patch @@ -0,0 +1,1127 @@ +https://github.com/sadko4u/lsp-plugins/pull/200 +diff --git a/Makefile b/Makefile +index 2d9cb79..8dbd689 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,3 +1,9 @@ ++# Command-line flag to silence nested $(MAKE). ++$(VERBOSE)MAKESILENT = -s ++ ++# Suppress display of executed commands. ++$(VERBOSE).SILENT: ++ + # Common definitions + RELEASE_TEXT = LICENSE.txt README.txt CHANGELOG.txt + RELEASE_SRC = $(RELEASE_TEXT) src build-*.sh include res Makefile release.sh +@@ -153,38 +159,38 @@ profile: compile + + # Compilation and cleaning targets + compile_info: +- @echo "-------------------------------------------------------------------------------" +- @echo "Building binaries" +- @echo " target architecture : $(BUILD_PROFILE)" +- @echo " target platform : $(BUILD_PLATFORM)" +- @echo " target system : $(BUILD_SYSTEM)" +- @echo " compiler : $(BUILD_COMPILER)" +- @echo " modules : $(BUILD_MODULES)" +- @echo " UI : LV2=$(LV2_UI), VST=$(VST_UI)" +- @echo " 3D rendering : $(BUILD_R3D_BACKENDS)" +- @echo " build directory : $(OBJDIR)" +- @echo "-------------------------------------------------------------------------------" ++ echo "-------------------------------------------------------------------------------" ++ echo "Building binaries" ++ echo " target architecture : $(BUILD_PROFILE)" ++ echo " target platform : $(BUILD_PLATFORM)" ++ echo " target system : $(BUILD_SYSTEM)" ++ echo " compiler : $(BUILD_COMPILER)" ++ echo " modules : $(BUILD_MODULES)" ++ echo " UI : LV2=$(LV2_UI), VST=$(VST_UI)" ++ echo " 3D rendering : $(BUILD_R3D_BACKENDS)" ++ echo " build directory : $(OBJDIR)" ++ echo "-------------------------------------------------------------------------------" + + compile: | compile_info +- @mkdir -p $(OBJDIR)/src +- @mkdir -p $(CFGDIR) +- @test -f "$(CFGDIR)/$(PREFIX_FILE)" || echo -n "$(PREFIX)" > "$(CFGDIR)/$(PREFIX_FILE)" +- @test -f "$(CFGDIR)/$(MODULES_FILE)" || echo -n "$(BUILD_MODULES)" > "$(CFGDIR)/$(MODULES_FILE)" +- @test -f "$(CFGDIR)/$(BUILD_PROFILE)" || echo -n "$(BUILD_PROFILE)" > "$(CFGDIR)/$(BUILD_PROFILE_FILE)" +- @test -f "$(CFGDIR)/$(R3D_BACKENDS_FILE)" || echo -n "$(BUILD_R3D_BACKENDS)" > "$(CFGDIR)/$(R3D_BACKENDS_FILE)" +- @$(MAKE) $(MAKE_OPTS) -C src all OBJDIR=$(OBJDIR)/src +- @echo "Build OK" ++ mkdir -p $(OBJDIR)/src ++ mkdir -p $(CFGDIR) ++ test -f "$(CFGDIR)/$(PREFIX_FILE)" || echo -n "$(PREFIX)" > "$(CFGDIR)/$(PREFIX_FILE)" ++ test -f "$(CFGDIR)/$(MODULES_FILE)" || echo -n "$(BUILD_MODULES)" > "$(CFGDIR)/$(MODULES_FILE)" ++ test -f "$(CFGDIR)/$(BUILD_PROFILE)" || echo -n "$(BUILD_PROFILE)" > "$(CFGDIR)/$(BUILD_PROFILE_FILE)" ++ test -f "$(CFGDIR)/$(R3D_BACKENDS_FILE)" || echo -n "$(BUILD_R3D_BACKENDS)" > "$(CFGDIR)/$(R3D_BACKENDS_FILE)" ++ $(MAKE) $(MAKESILENT) $(MAKE_OPTS) -C src all OBJDIR=$(OBJDIR)/src ++ echo "Build OK" + + test_compile: | compile_info +- @mkdir -p $(OBJDIR)/src +- @$(MAKE) $(MAKE_OPTS) -C src all OBJDIR=$(OBJDIR)/src +- @echo "Test Build OK" ++ mkdir -p $(OBJDIR)/src ++ $(MAKE) $(MAKESILENT) $(MAKE_OPTS) -C src all OBJDIR=$(OBJDIR)/src ++ echo "Test Build OK" + + clean: +- @-rm -rf $(BUILDDIR) +- @-rm -rf $(TESTDIR) +- @-rm -rf $(CFGDIR) +- @echo "Clean OK" ++ -rm -rf $(BUILDDIR) ++ -rm -rf $(TESTDIR) ++ -rm -rf $(CFGDIR) ++ echo "Clean OK" + + # Build targets + build_ladspa: export BUILD_MODULES = ladspa +@@ -205,184 +211,184 @@ build_doc: compile + + # Installation targets + install: $(INSTALLATIONS) +- @echo "Install OK" ++ echo "Install OK" + + install_ladspa: all +- @echo "Installing LADSPA plugins to $(DESTDIR)$(LADSPA_PATH)/" +- @mkdir -p $(DESTDIR)$(LADSPA_PATH) +- @$(INSTALL) $(LIB_LADSPA) $(DESTDIR)$(LADSPA_PATH)/ ++ echo "Installing LADSPA plugins to $(DESTDIR)$(LADSPA_PATH)/" ++ mkdir -p $(DESTDIR)$(LADSPA_PATH) ++ $(INSTALL) $(LIB_LADSPA) $(DESTDIR)$(LADSPA_PATH)/ + + install_lv2: all +- @echo "Installing LV2 plugins to $(DESTDIR)$(LV2_PATH)/$(ARTIFACT_ID).lv2" +- @mkdir -p "$(DESTDIR)$(LV2_PATH)/$(ARTIFACT_ID).lv2" +- @$(INSTALL) $(LIB_LV2) "$(DESTDIR)$(LV2_PATH)/$(ARTIFACT_ID).lv2/" +- @test ! "$(BUILD_R3D_BACKENDS)" || $(INSTALL) $(OBJDIR)/$(R3D_ARTIFACT_ID)*.so $(DESTDIR)$(LV2_PATH)/$(ARTIFACT_ID).lv2/ +- @$(UTL_GENTTL) "$(DESTDIR)$(LV2_PATH)/$(ARTIFACT_ID).lv2" ++ echo "Installing LV2 plugins to $(DESTDIR)$(LV2_PATH)/$(ARTIFACT_ID).lv2" ++ mkdir -p "$(DESTDIR)$(LV2_PATH)/$(ARTIFACT_ID).lv2" ++ $(INSTALL) $(LIB_LV2) "$(DESTDIR)$(LV2_PATH)/$(ARTIFACT_ID).lv2/" ++ test ! "$(BUILD_R3D_BACKENDS)" || $(INSTALL) $(OBJDIR)/$(R3D_ARTIFACT_ID)*.so $(DESTDIR)$(LV2_PATH)/$(ARTIFACT_ID).lv2/ ++ $(UTL_GENTTL) "$(DESTDIR)$(LV2_PATH)/$(ARTIFACT_ID).lv2" + + install_vst: all +- @echo "Installing VST plugins to $(DESTDIR)$(VST_PATH)/$(VST_ID)" +- @mkdir -p "$(DESTDIR)$(VST_PATH)/$(VST_ID)" +- @$(INSTALL) $(LIB_VST) "$(DESTDIR)$(VST_PATH)/$(VST_ID)/" +- @test ! "$(BUILD_R3D_BACKENDS)" || $(INSTALL) $(OBJDIR)/$(R3D_ARTIFACT_ID)*.so $(DESTDIR)$(VST_PATH)/$(VST_ID)/ +- @$(INSTALL) $(OBJDIR)/src/vst/*.so $(DESTDIR)$(VST_PATH)/$(VST_ID)/ ++ echo "Installing VST plugins to $(DESTDIR)$(VST_PATH)/$(VST_ID)" ++ mkdir -p "$(DESTDIR)$(VST_PATH)/$(VST_ID)" ++ $(INSTALL) $(LIB_VST) "$(DESTDIR)$(VST_PATH)/$(VST_ID)/" ++ test ! "$(BUILD_R3D_BACKENDS)" || $(INSTALL) $(OBJDIR)/$(R3D_ARTIFACT_ID)*.so $(DESTDIR)$(VST_PATH)/$(VST_ID)/ ++ $(INSTALL) $(OBJDIR)/src/vst/*.so $(DESTDIR)$(VST_PATH)/$(VST_ID)/ + + install_jack: all +- @echo "Installing JACK core to $(DESTDIR)$(LIB_PATH)/$(ARTIFACT_ID)" +- @mkdir -p "$(DESTDIR)$(LIB_PATH)/$(ARTIFACT_ID)" +- @$(INSTALL) $(LIB_JACK) "$(DESTDIR)$(LIB_PATH)/$(ARTIFACT_ID)/" +- @test ! "$(BUILD_R3D_BACKENDS)" || $(INSTALL) $(OBJDIR)/$(R3D_ARTIFACT_ID)*.so "$(DESTDIR)$(LIB_PATH)/$(ARTIFACT_ID)/" +- @echo "Installing JACK standalone plugins to $(DESTDIR)$(BIN_PATH)" +- @mkdir -p "$(DESTDIR)$(BIN_PATH)" +- @$(MAKE) $(MAKE_OPTS) -C $(OBJDIR)/src/jack install TARGET_PATH="$(DESTDIR)$(BIN_PATH)" INSTALL="$(INSTALL)" ++ echo "Installing JACK core to $(DESTDIR)$(LIB_PATH)/$(ARTIFACT_ID)" ++ mkdir -p "$(DESTDIR)$(LIB_PATH)/$(ARTIFACT_ID)" ++ $(INSTALL) $(LIB_JACK) "$(DESTDIR)$(LIB_PATH)/$(ARTIFACT_ID)/" ++ test ! "$(BUILD_R3D_BACKENDS)" || $(INSTALL) $(OBJDIR)/$(R3D_ARTIFACT_ID)*.so "$(DESTDIR)$(LIB_PATH)/$(ARTIFACT_ID)/" ++ echo "Installing JACK standalone plugins to $(DESTDIR)$(BIN_PATH)" ++ mkdir -p "$(DESTDIR)$(BIN_PATH)" ++ $(MAKE) $(MAKESILENT) $(MAKE_OPTS) -C $(OBJDIR)/src/jack install TARGET_PATH="$(DESTDIR)$(BIN_PATH)" INSTALL="$(INSTALL)" + + install_xdg: +- @echo "Installing desktop icons to $(DESTDIR)$(SHARE_PATH)/applications" +- @mkdir -p "$(DESTDIR)$(SHARE_PATH)/applications" +- @mkdir -p "$(DESTDIR)$(SHARE_PATH)/desktop-directories" +- @mkdir -p "$(DESTDIR)$(ETC_PATH)/xdg/menus/applications-merged" +- @mkdir -p "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/scalable/apps" +- @mkdir -p "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/16x16/apps" +- @mkdir -p "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/22x22/apps" +- @mkdir -p "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/24x24/apps" +- @mkdir -p "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/32x32/apps" +- @mkdir -p "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/48x48/apps" +- @mkdir -p "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/64x64/apps" +- @mkdir -p "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/128x128/apps" +- @mkdir -p "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/256x256/apps" +- @cp res/xdg/*.desktop "$(DESTDIR)$(SHARE_PATH)/applications/" +- @cp res/xdg/lsp-plugins.directory "$(DESTDIR)$(SHARE_PATH)/desktop-directories/" +- @cp res/xdg/lsp-plugins.menu "$(DESTDIR)$(ETC_PATH)/xdg/menus/applications-merged/" +- @cp -f res/icons/$(ARTIFACT_ID)-16.png "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/16x16/apps/$(ARTIFACT_ID).png" +- @cp -f res/icons/$(ARTIFACT_ID)-22.png "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/22x22/apps/$(ARTIFACT_ID).png" +- @cp -f res/icons/$(ARTIFACT_ID)-24.png "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/24x24/apps/$(ARTIFACT_ID).png" +- @cp -f res/icons/$(ARTIFACT_ID)-32.png "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/32x32/apps/$(ARTIFACT_ID).png" +- @cp -f res/icons/$(ARTIFACT_ID)-48.png "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/48x48/apps/$(ARTIFACT_ID).png" +- @cp -f res/icons/$(ARTIFACT_ID)-64.png "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/64x64/apps/$(ARTIFACT_ID).png" +- @cp -f res/icons/$(ARTIFACT_ID)-128.png "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/128x128/apps/$(ARTIFACT_ID).png" +- @cp -f res/icons/$(ARTIFACT_ID)-256.png "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/256x256/apps/$(ARTIFACT_ID).png" +- @cp -f res/icons/$(ARTIFACT_ID)-exp.svg "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/scalable/apps/$(ARTIFACT_ID).svg" ++ echo "Installing desktop icons to $(DESTDIR)$(SHARE_PATH)/applications" ++ mkdir -p "$(DESTDIR)$(SHARE_PATH)/applications" ++ mkdir -p "$(DESTDIR)$(SHARE_PATH)/desktop-directories" ++ mkdir -p "$(DESTDIR)$(ETC_PATH)/xdg/menus/applications-merged" ++ mkdir -p "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/scalable/apps" ++ mkdir -p "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/16x16/apps" ++ mkdir -p "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/22x22/apps" ++ mkdir -p "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/24x24/apps" ++ mkdir -p "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/32x32/apps" ++ mkdir -p "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/48x48/apps" ++ mkdir -p "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/64x64/apps" ++ mkdir -p "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/128x128/apps" ++ mkdir -p "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/256x256/apps" ++ cp res/xdg/*.desktop "$(DESTDIR)$(SHARE_PATH)/applications/" ++ cp res/xdg/lsp-plugins.directory "$(DESTDIR)$(SHARE_PATH)/desktop-directories/" ++ cp res/xdg/lsp-plugins.menu "$(DESTDIR)$(ETC_PATH)/xdg/menus/applications-merged/" ++ cp -f res/icons/$(ARTIFACT_ID)-16.png "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/16x16/apps/$(ARTIFACT_ID).png" ++ cp -f res/icons/$(ARTIFACT_ID)-22.png "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/22x22/apps/$(ARTIFACT_ID).png" ++ cp -f res/icons/$(ARTIFACT_ID)-24.png "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/24x24/apps/$(ARTIFACT_ID).png" ++ cp -f res/icons/$(ARTIFACT_ID)-32.png "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/32x32/apps/$(ARTIFACT_ID).png" ++ cp -f res/icons/$(ARTIFACT_ID)-48.png "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/48x48/apps/$(ARTIFACT_ID).png" ++ cp -f res/icons/$(ARTIFACT_ID)-64.png "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/64x64/apps/$(ARTIFACT_ID).png" ++ cp -f res/icons/$(ARTIFACT_ID)-128.png "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/128x128/apps/$(ARTIFACT_ID).png" ++ cp -f res/icons/$(ARTIFACT_ID)-256.png "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/256x256/apps/$(ARTIFACT_ID).png" ++ cp -f res/icons/$(ARTIFACT_ID)-exp.svg "$(DESTDIR)$(SHARE_PATH)/icons/hicolor/scalable/apps/$(ARTIFACT_ID).svg" + + install_doc: all +- @echo "Installing documentation to $(DESTDIR)$(DOC_PATH)" +- @mkdir -p $(DESTDIR)$(DOC_PATH)/$(ARTIFACT_ID) +- @cp -r $(OBJDIR)/html/* $(DESTDIR)$(DOC_PATH)/$(ARTIFACT_ID) ++ echo "Installing documentation to $(DESTDIR)$(DOC_PATH)" ++ mkdir -p $(DESTDIR)$(DOC_PATH)/$(ARTIFACT_ID) ++ cp -r $(OBJDIR)/html/* $(DESTDIR)$(DOC_PATH)/$(ARTIFACT_ID) + + # Release targets + dbg_release: export CFLAGS += -DLSP_TRACE -O2 + dbg_release: export CXXFLAGS += -DLSP_TRACE -O2 + dbg_release: $(RELEASES) +- @echo "Debug Release OK" ++ echo "Debug Release OK" + + release: INSTALL += -s + release: $(RELEASES) +- @echo "Release OK" ++ echo "Release OK" + + release_prepare: all +- @echo "Releasing plugins for architecture $(BUILD_PROFILE)" +- @mkdir -p $(RELEASE) +- @mkdir -p $(DESTDIR) ++ echo "Releasing plugins for architecture $(BUILD_PROFILE)" ++ mkdir -p $(RELEASE) ++ mkdir -p $(DESTDIR) + + release_ladspa: DESTDIR=$(RELEASE_BIN)/$(LADSPA_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE) + release_ladspa: | release_prepare install_ladspa +- @echo "Releasing LADSPA binaries" +- @cp $(RELEASE_TEXT) $(DESTDIR)/ +- @tar -C $(RELEASE_BIN) -czf $(RELEASE_BIN)/$(LADSPA_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE).tar.gz $(LADSPA_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE) +- @rm -rf $(DESTDIR) ++ echo "Releasing LADSPA binaries" ++ cp $(RELEASE_TEXT) $(DESTDIR)/ ++ tar -C $(RELEASE_BIN) -czf $(RELEASE_BIN)/$(LADSPA_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE).tar.gz $(LADSPA_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE) ++ rm -rf $(DESTDIR) + + release_lv2: DESTDIR=$(RELEASE_BIN)/$(LV2_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE) + release_lv2: | release_prepare install_lv2 +- @echo "Releasing LV2 binaries" +- @cp $(RELEASE_TEXT) $(DESTDIR)/ +- @tar -C $(RELEASE_BIN) -czf $(RELEASE_BIN)/$(LV2_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE).tar.gz $(LV2_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE) +- @rm -rf $(DESTDIR) ++ echo "Releasing LV2 binaries" ++ cp $(RELEASE_TEXT) $(DESTDIR)/ ++ tar -C $(RELEASE_BIN) -czf $(RELEASE_BIN)/$(LV2_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE).tar.gz $(LV2_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE) ++ rm -rf $(DESTDIR) + + release_vst: DESTDIR=$(RELEASE_BIN)/$(VST_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE) + release_vst: | release_prepare install_vst +- @echo "Releasing VST binaries" +- @cp $(RELEASE_TEXT) $(DESTDIR)/ +- @tar -C $(RELEASE_BIN) -czf $(RELEASE_BIN)/$(VST_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE).tar.gz $(VST_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE) +- @rm -rf $(DESTDIR) ++ echo "Releasing VST binaries" ++ cp $(RELEASE_TEXT) $(DESTDIR)/ ++ tar -C $(RELEASE_BIN) -czf $(RELEASE_BIN)/$(VST_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE).tar.gz $(VST_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE) ++ rm -rf $(DESTDIR) + + release_jack: DESTDIR=$(RELEASE_BIN)/$(JACK_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE) + release_jack: | release_prepare install_jack +- @echo "Releasing JACK binaries" +- @cp $(RELEASE_TEXT) $(DESTDIR)/ +- @tar -C $(RELEASE_BIN) -czf $(RELEASE_BIN)/$(JACK_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE).tar.gz $(JACK_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE) +- @rm -rf $(DESTDIR) ++ echo "Releasing JACK binaries" ++ cp $(RELEASE_TEXT) $(DESTDIR)/ ++ tar -C $(RELEASE_BIN) -czf $(RELEASE_BIN)/$(JACK_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE).tar.gz $(JACK_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE) ++ rm -rf $(DESTDIR) + + release_profile: DESTDIR=$(RELEASE_BIN)/$(PROFILE_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE) + release_profile: | release_prepare +- @echo "Releasing PROFILE binaries" +- @$(INSTALL) $(BIN_PROFILE) $(DESTDIR)/ +- @cp $(RELEASE_TEXT) $(DESTDIR)/ +- @tar -C $(RELEASE_BIN) -czf $(RELEASE_BIN)/$(PROFILE_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE).tar.gz $(PROFILE_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE) +- @rm -rf $(RELEASE_BIN)/$(PROFILE_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE) ++ echo "Releasing PROFILE binaries" ++ $(INSTALL) $(BIN_PROFILE) $(DESTDIR)/ ++ cp $(RELEASE_TEXT) $(DESTDIR)/ ++ tar -C $(RELEASE_BIN) -czf $(RELEASE_BIN)/$(PROFILE_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE).tar.gz $(PROFILE_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE) ++ rm -rf $(RELEASE_BIN)/$(PROFILE_ID)-$(BUILD_SYSTEM)-$(BUILD_PROFILE) + + release_src: DESTDIR=$(RELEASE)/$(SRC_ID) + release_src: | release_prepare +- @echo "Releasing source code binaries" +- @mkdir -p $(DESTDIR) +- @mkdir -p $(DESTDIR)/scripts +- @cp -R $(RELEASE_SRC) $(DESTDIR)/ +- @cp -R $(RELEASE_SCRIPTS) $(DESTDIR)/scripts/ +- @tar -C $(RELEASE) -czf $(RELEASE)/$(SRC_ID).tar.gz $(SRC_ID) +- @rm -rf $(DESTDIR) ++ echo "Releasing source code binaries" ++ mkdir -p $(DESTDIR) ++ mkdir -p $(DESTDIR)/scripts ++ cp -R $(RELEASE_SRC) $(DESTDIR)/ ++ cp -R $(RELEASE_SCRIPTS) $(DESTDIR)/scripts/ ++ tar -C $(RELEASE) -czf $(RELEASE)/$(SRC_ID).tar.gz $(SRC_ID) ++ rm -rf $(DESTDIR) + + release_doc: DESTDIR=$(RELEASE)/$(DOC_ID) + release_doc: | release_prepare +- @echo "Releasing documentation" +- @mkdir -p $(DESTDIR) +- @cp -r $(OBJDIR)/html/* $(DESTDIR)/ +- @cp $(RELEASE_TEXT) $(DESTDIR)/ +- @tar -C $(RELEASE) -czf $(RELEASE)/$(DOC_ID).tar.gz $(DOC_ID) +- @rm -rf $(DESTDIR) ++ echo "Releasing documentation" ++ mkdir -p $(DESTDIR) ++ cp -r $(OBJDIR)/html/* $(DESTDIR)/ ++ cp $(RELEASE_TEXT) $(DESTDIR)/ ++ tar -C $(RELEASE) -czf $(RELEASE)/$(DOC_ID).tar.gz $(DOC_ID) ++ rm -rf $(DESTDIR) + + # Unrelease target + unrelease: clean +- @-rm -rf $(RELEASE) +- @echo "Unrelease OK" ++ -rm -rf $(RELEASE) ++ echo "Unrelease OK" + + # Uninstall target + uninstall: $(UNINSTALLATIONS) +- @echo "Uninstall OK" ++ echo "Uninstall OK" + + uninstall_ladspa: +- @echo "Uninstalling LADSPA" +- @-rm -f $(DESTDIR)$(LADSPA_PATH)/$(ARTIFACT_ID)-ladspa.so ++ echo "Uninstalling LADSPA" ++ -rm -f $(DESTDIR)$(LADSPA_PATH)/$(ARTIFACT_ID)-ladspa.so + + uninstall_lv2: +- @echo "Uninstalling LV2" +- @-rm -rf $(DESTDIR)$(LV2_PATH)/$(ARTIFACT_ID).lv2 ++ echo "Uninstalling LV2" ++ -rm -rf $(DESTDIR)$(LV2_PATH)/$(ARTIFACT_ID).lv2 + + uninstall_vst: +- @echo "Uninstalling VST" +- @-rm -f $(DESTDIR)$(VST_PATH)/$(ARTIFACT_ID)-vst-*.so +- @-rm -rf $(DESTDIR)$(VST_PATH)/$(ARTIFACT_ID)-lxvst-* +- @-rm -rf $(DESTDIR)$(VST_PATH)/$(VST_ID) ++ echo "Uninstalling VST" ++ -rm -f $(DESTDIR)$(VST_PATH)/$(ARTIFACT_ID)-vst-*.so ++ -rm -rf $(DESTDIR)$(VST_PATH)/$(ARTIFACT_ID)-lxvst-* ++ -rm -rf $(DESTDIR)$(VST_PATH)/$(VST_ID) + + uninstall_jack: +- @echo "Uninstalling JACK" +- @-rm -f $(DESTDIR)$(BIN_PATH)/$(ARTIFACT_ID)-* +- @-rm -f $(DESTDIR)$(LIB_PATH)/$(ARTIFACT_ID)-jack-core-*.so +- @-rm -f $(DESTDIR)$(LIB_PATH)/$(R3D_ARTIFACT_ID) +- @-rm -rf $(DESTDIR)$(LIB_PATH)/$(ARTIFACT_ID) ++ echo "Uninstalling JACK" ++ -rm -f $(DESTDIR)$(BIN_PATH)/$(ARTIFACT_ID)-* ++ -rm -f $(DESTDIR)$(LIB_PATH)/$(ARTIFACT_ID)-jack-core-*.so ++ -rm -f $(DESTDIR)$(LIB_PATH)/$(R3D_ARTIFACT_ID) ++ -rm -rf $(DESTDIR)$(LIB_PATH)/$(ARTIFACT_ID) + + uninstall_xdg: +- @echo "Uninstalling desktop icons" +- @-rm -f $(DESTDIR)$(SHARE_PATH)/applications/in.lsp_plug.*.desktop +- @-rm -f $(DESTDIR)$(SHARE_PATH)/desktop-directories/lsp-plugins.directory +- @-rm -f $(DESTDIR)$(ETC_PATH)/xdg/menus/applications-merged/lsp-plugins.menu +- @-rm -f $(DESTDIR)$(SHARE_PATH)/icons/hicolor/16x16/apps/$(ARTIFACT_ID).* +- @-rm -f $(DESTDIR)$(SHARE_PATH)/icons/hicolor/22x22/apps/$(ARTIFACT_ID).* +- @-rm -f $(DESTDIR)$(SHARE_PATH)/icons/hicolor/24x24/apps/$(ARTIFACT_ID).* +- @-rm -f $(DESTDIR)$(SHARE_PATH)/icons/hicolor/32x32/apps/$(ARTIFACT_ID).* +- @-rm -f $(DESTDIR)$(SHARE_PATH)/icons/hicolor/48x48/apps/$(ARTIFACT_ID).* +- @-rm -f $(DESTDIR)$(SHARE_PATH)/icons/hicolor/64x64/apps/$(ARTIFACT_ID).* +- @-rm -f $(DESTDIR)$(SHARE_PATH)/icons/hicolor/128x128/apps/$(ARTIFACT_ID).* +- @-rm -f $(DESTDIR)$(SHARE_PATH)/icons/hicolor/256x256/apps/$(ARTIFACT_ID).* +- @-rm -f $(DESTDIR)$(SHARE_PATH)/icons/hicolor/scalable/apps/$(ARTIFACT_ID).* ++ echo "Uninstalling desktop icons" ++ -rm -f $(DESTDIR)$(SHARE_PATH)/applications/in.lsp_plug.*.desktop ++ -rm -f $(DESTDIR)$(SHARE_PATH)/desktop-directories/lsp-plugins.directory ++ -rm -f $(DESTDIR)$(ETC_PATH)/xdg/menus/applications-merged/lsp-plugins.menu ++ -rm -f $(DESTDIR)$(SHARE_PATH)/icons/hicolor/16x16/apps/$(ARTIFACT_ID).* ++ -rm -f $(DESTDIR)$(SHARE_PATH)/icons/hicolor/22x22/apps/$(ARTIFACT_ID).* ++ -rm -f $(DESTDIR)$(SHARE_PATH)/icons/hicolor/24x24/apps/$(ARTIFACT_ID).* ++ -rm -f $(DESTDIR)$(SHARE_PATH)/icons/hicolor/32x32/apps/$(ARTIFACT_ID).* ++ -rm -f $(DESTDIR)$(SHARE_PATH)/icons/hicolor/48x48/apps/$(ARTIFACT_ID).* ++ -rm -f $(DESTDIR)$(SHARE_PATH)/icons/hicolor/64x64/apps/$(ARTIFACT_ID).* ++ -rm -f $(DESTDIR)$(SHARE_PATH)/icons/hicolor/128x128/apps/$(ARTIFACT_ID).* ++ -rm -f $(DESTDIR)$(SHARE_PATH)/icons/hicolor/256x256/apps/$(ARTIFACT_ID).* ++ -rm -f $(DESTDIR)$(SHARE_PATH)/icons/hicolor/scalable/apps/$(ARTIFACT_ID).* + + uninstall_doc: +- @echo "Uninstalling DOC" +- @-rm -rf $(DESTDIR)$(DOC_PATH)/$(ARTIFACT_ID) ++ echo "Uninstalling DOC" ++ -rm -rf $(DESTDIR)$(DOC_PATH)/$(ARTIFACT_ID) + +diff --git a/scripts/make/tools.mk b/scripts/make/tools.mk +index 1fb917e..565dbb1 100644 +--- a/scripts/make/tools.mk ++++ b/scripts/make/tools.mk +@@ -25,7 +25,6 @@ CXX ?= $(TOOL_CXX) + PHP ?= $(TOOL_PHP) + LD ?= $(TOOL_LD) + +-MAKE_OPTS = -s + CFLAGS += $(CC_ARCH) $(FLAG_CTUNE) $(CC_FLAGS) $(FLAG_VERSION) + CXXFLAGS += $(CC_ARCH) $(FLAG_CTUNE) $(CC_FLAGS) $(FLAG_VERSION) + SO_FLAGS = $(CC_ARCH) $(FLAG_RELRO) -Wl,--gc-sections -shared -Llibrary -lc -fPIC +@@ -62,7 +61,6 @@ export CXX + export PHP + export LD + +-export MAKE_OPTS + export CFLAGS + export CXXFLAGS + export SO_FLAGS +diff --git a/src/Makefile b/src/Makefile +index 8546191..e3cf800 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -1,3 +1,9 @@ ++# Command-line flag to silence nested $(MAKE). ++$(VERBOSE)MAKESILENT = -s ++ ++# Suppress display of executed commands. ++$(VERBOSE).SILENT: ++ + SUBDIRS = core metadata utils + MODULES = $(SUBDIRS) + CONTAINER_DEPS = $(OBJ_METADATA) $(OBJ_CORE) $(UTL_FILES) +@@ -66,9 +72,9 @@ target: all + + # Rules + $(SUBDIRS): +- @echo "Building $(@)" +- @mkdir -p $(OBJDIR)/$(@) +- @$(MAKE) $(MAKE_OPTS) -C $@ $(MAKECMDGOALS) OBJDIR=$(OBJDIR)/$(@) ++ echo "Building $(@)" ++ mkdir -p $(OBJDIR)/$(@) ++ $(MAKE) $(MAKESILENT) $(MAKE_OPTS) -C $@ $(MAKECMDGOALS) OBJDIR=$(OBJDIR)/$(@) + + # Object dependencies + $(OBJ_CORE): core +@@ -92,11 +98,11 @@ $(OBJ_TEST_CORE): test + $(OBJ_TESTING_CORE): test testing rendering + + $(OBJ_RES_CORE): $(OBJ_CORE) $(UTL_RESGEN) +- @echo "Generating builtin resources" +- @mkdir -p $(OBJDIR)/res +- @$(UTL_RESGEN) $(OBJDIR)/res/builtin_resource.cpp $(RESOURCE_PATHS) +- @-rm gmon.out >/dev/null 2>&1 +- @$(CXX) -o $(OBJ_RES_CORE) -c $(OBJDIR)/res/builtin_resource.cpp -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) ++ echo "Generating builtin resources" ++ mkdir -p $(OBJDIR)/res ++ $(UTL_RESGEN) $(OBJDIR)/res/builtin_resource.cpp $(RESOURCE_PATHS) ++ -rm gmon.out >/dev/null 2>&1 ++ $(CXX) -o $(OBJ_RES_CORE) -c $(OBJDIR)/res/builtin_resource.cpp -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) + + # Target dependencies + container: $(CONTAINER_DEPS) +@@ -107,19 +113,19 @@ doc: utils $(PHP_PLUGINS) + + # Additional processing + $(PHP_PLUGINS): $(UTL_GENPHP) +- @echo "Generating PHP file $(notdir $(PHP_PLUGINS))" +- @$(UTL_GENPHP) $(PHP_PLUGINS) ++ echo "Generating PHP file $(notdir $(PHP_PLUGINS))" ++ $(UTL_GENPHP) $(PHP_PLUGINS) + + vst_stub: $(UTL_VSTMAKE) +- @echo "Building VST stub" +- @mkdir -p $(OBJDIR)/vst +- @$(UTL_VSTMAKE) $(OBJDIR)/vst +- @-rm gmon.out >/dev/null 2>&1 +- @$(MAKE) $(MAKE_OPTS) -C $(OBJDIR)/vst all OBJDIR=$(OBJDIR)/vst ++ echo "Building VST stub" ++ mkdir -p $(OBJDIR)/vst ++ $(UTL_VSTMAKE) $(OBJDIR)/vst ++ -rm gmon.out >/dev/null 2>&1 ++ $(MAKE) $(MAKESILENT) $(MAKE_OPTS) -C $(OBJDIR)/vst all OBJDIR=$(OBJDIR)/vst + + jack_stub: $(UTL_JACKMAKE) +- @echo "Building JACK stub" +- @mkdir -p $(OBJDIR)/jack +- @$(UTL_JACKMAKE) $(OBJDIR)/jack +- @-rm gmon.out >/dev/null 2>&1 +- @$(MAKE) $(MAKE_OPTS) -C $(OBJDIR)/jack all OBJDIR=$(OBJDIR)/jack ++ echo "Building JACK stub" ++ mkdir -p $(OBJDIR)/jack ++ $(UTL_JACKMAKE) $(OBJDIR)/jack ++ -rm gmon.out >/dev/null 2>&1 ++ $(MAKE) $(MAKESILENT) $(MAKE_OPTS) -C $(OBJDIR)/jack all OBJDIR=$(OBJDIR)/jack +diff --git a/src/container/Makefile b/src/container/Makefile +index 8aa8196..74773f0 100644 +--- a/src/container/Makefile ++++ b/src/container/Makefile +@@ -1,3 +1,9 @@ ++# Command-line flag to silence nested $(MAKE). ++$(VERBOSE)MAKESILENT = -s ++ ++# Suppress display of executed commands. ++$(VERBOSE).SILENT: ++ + FILES = $(addprefix $(OBJDIR)/, $(patsubst %.cpp, %.o, $(wildcard *.cpp))) + FILE = $(@:$(OBJDIR)/%.o=%.cpp) + OBJ_HELPERS = $(OBJDIR)/CairoCanvas.o +@@ -58,41 +64,41 @@ endif + all: $(MODULES) + + $(OBJ_HELPERS): +- @echo " $(CXX) $(FILE)" +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(CAIRO_HEADERS) ++ echo " $(CXX) $(FILE)" ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(CAIRO_HEADERS) + + $(LIB_LADSPA): +- @echo " $(CXX) ladspa.cpp" +- @$(CXX) -o $(OBJDIR)/ladspa.o -c ladspa.cpp -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) +- @echo " $(CXX) $(notdir $(LIB_LADSPA))" +- @$(CXX) -o $(LIB_LADSPA) $(OBJDIR)/ladspa.o $(OBJFILES) $(SO_FLAGS) $(LIBS) ++ echo " $(CXX) ladspa.cpp" ++ $(CXX) -o $(OBJDIR)/ladspa.o -c ladspa.cpp -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) ++ echo " $(CXX) $(notdir $(LIB_LADSPA))" ++ $(CXX) -o $(LIB_LADSPA) $(OBJDIR)/ladspa.o $(OBJFILES) $(SO_FLAGS) $(LIBS) + + $(LIB_LV2): $(X_LV2_DEPS) +- @echo " $(CXX) lv2.cpp" +- @$(CXX) -o $(OBJDIR)/lv2.o -c lv2.cpp -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(CAIRO_HEADERS) $(LV2_HEADERS) +- @echo " $(CXX) $(notdir $(X_LIB_LV2))" +- @$(CXX) -o $(LIB_LV2) $(OBJDIR)/lv2.o $(X_LV2_OBJFILES) $(SO_FLAGS) $(X_LV2_LIBS) ++ echo " $(CXX) lv2.cpp" ++ $(CXX) -o $(OBJDIR)/lv2.o -c lv2.cpp -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(CAIRO_HEADERS) $(LV2_HEADERS) ++ echo " $(CXX) $(notdir $(X_LIB_LV2))" ++ $(CXX) -o $(LIB_LV2) $(OBJDIR)/lv2.o $(X_LV2_OBJFILES) $(SO_FLAGS) $(X_LV2_LIBS) + + $(LIB_VST): +- @echo " $(CXX) vst.cpp" +- @$(CXX) -o $(OBJDIR)/vst.o -c vst.cpp -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) +- @echo " $(CXX) $(notdir $(LIB_VST))" +- @$(CXX) -o $(LIB_VST) $(OBJDIR)/vst.o $(X_VST_OBJFILES) $(SO_FLAGS) $(X_VST_LIBS) ++ echo " $(CXX) vst.cpp" ++ $(CXX) -o $(OBJDIR)/vst.o -c vst.cpp -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) ++ echo " $(CXX) $(notdir $(LIB_VST))" ++ $(CXX) -o $(LIB_VST) $(OBJDIR)/vst.o $(X_VST_OBJFILES) $(SO_FLAGS) $(X_VST_LIBS) + + $(LIB_JACK): $(OBJ_HELPERS) +- @echo " $(CXX) jack.cpp" +- @$(CXX) -o $(OBJDIR)/jack.o -c jack.cpp -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(JACK_HEADERS) $(CAIRO_HEADERS) +- @echo " $(CXX) $(notdir $(LIB_JACK))" +- @$(CXX) -o $(LIB_JACK) $(OBJDIR)/jack.o $(OBJ_HELPERS) $(OBJFILES) $(UI_OBJFILES) $(SO_FLAGS) $(LIBS) $(UI_LIBS) $(JACK_LIBS) ++ echo " $(CXX) jack.cpp" ++ $(CXX) -o $(OBJDIR)/jack.o -c jack.cpp -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(JACK_HEADERS) $(CAIRO_HEADERS) ++ echo " $(CXX) $(notdir $(LIB_JACK))" ++ $(CXX) -o $(LIB_JACK) $(OBJDIR)/jack.o $(OBJ_HELPERS) $(OBJFILES) $(UI_OBJFILES) $(SO_FLAGS) $(LIBS) $(UI_LIBS) $(JACK_LIBS) + + $(BIN_PROFILE): $(LIB_JACK) +- @echo " $(CXX) profile.cpp" +- @$(CXX) -o $(OBJDIR)/profile.o -c profile.cpp -fPIC $(CPPFLAGS) -DLSP_PROFILING_MAIN $(CXXFLAGS) $(INCLUDE) $(JACK_HEADERS) +- @echo " $(CXX) $(notdir $(BIN_PROFILE))" +- @$(CXX) -o $(BIN_PROFILE) $(OBJDIR)/jack.o $(OBJDIR)/profile.o $(OBJ_HELPERS) $(OBJFILES) $(UI_OBJFILES) $(EXE_FLAGS) $(LIBS) $(UI_LIBS) $(JACK_LIBS) ++ echo " $(CXX) profile.cpp" ++ $(CXX) -o $(OBJDIR)/profile.o -c profile.cpp -fPIC $(CPPFLAGS) -DLSP_PROFILING_MAIN $(CXXFLAGS) $(INCLUDE) $(JACK_HEADERS) ++ echo " $(CXX) $(notdir $(BIN_PROFILE))" ++ $(CXX) -o $(BIN_PROFILE) $(OBJDIR)/jack.o $(OBJDIR)/profile.o $(OBJ_HELPERS) $(OBJFILES) $(UI_OBJFILES) $(EXE_FLAGS) $(LIBS) $(UI_LIBS) $(JACK_LIBS) + + $(BIN_TEST): $(LIB_JACK) +- @echo " $(CXX) test.cpp" +- @$(CXX) -o $(OBJDIR)/test.o -c test.cpp -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(JACK_HEADERS) +- @echo " $(CXX) $(notdir $(BIN_TEST))" +- @$(CXX) -o $(BIN_TEST) $(OBJDIR)/jack.o $(OBJDIR)/test.o $(OBJ_HELPERS) $(OBJFILES) $(UI_OBJFILES) $(EXE_TEST_FLAGS) $(LIBS) $(UI_LIBS) $(JACK_LIBS) $(OPENGL_LIBS) $(DL_LIBS) ++ echo " $(CXX) test.cpp" ++ $(CXX) -o $(OBJDIR)/test.o -c test.cpp -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(JACK_HEADERS) ++ echo " $(CXX) $(notdir $(BIN_TEST))" ++ $(CXX) -o $(BIN_TEST) $(OBJDIR)/jack.o $(OBJDIR)/test.o $(OBJ_HELPERS) $(OBJFILES) $(UI_OBJFILES) $(EXE_TEST_FLAGS) $(LIBS) $(UI_LIBS) $(JACK_LIBS) $(OPENGL_LIBS) $(DL_LIBS) +diff --git a/src/core/Makefile b/src/core/Makefile +index a9ce1a5..9ecfdf1 100644 +--- a/src/core/Makefile ++++ b/src/core/Makefile +@@ -1,3 +1,9 @@ ++# Command-line flag to silence nested $(MAKE). ++$(VERBOSE)MAKESILENT = -s ++ ++# Suppress display of executed commands. ++$(VERBOSE).SILENT: ++ + rwildcard = $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) + FILES = $(addprefix $(OBJDIR)/, $(patsubst %.cpp, %.o, $(call rwildcard, , *.cpp))) + FILE = $(@:$(OBJDIR)/%.o=%.cpp) +@@ -9,10 +15,10 @@ LIBS = $(PTHREAD_LIBS) + all: $(OBJ_CORE) + + $(FILES): +- @echo " $(CXX) $(FILE)" +- @mkdir -p $(dir $@) +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(LIBS) $(INCLUDE) ++ echo " $(CXX) $(FILE)" ++ mkdir -p $(dir $@) ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(LIBS) $(INCLUDE) + + $(OBJ_CORE): $(FILES) +- @echo " $(LD) $(notdir $(OBJ_CORE))" +- @$(LD) -o $(OBJ_CORE) -r $(MERGE_FLAGS) $(FILES) ++ echo " $(LD) $(notdir $(OBJ_CORE))" ++ $(LD) -o $(OBJ_CORE) -r $(MERGE_FLAGS) $(FILES) +diff --git a/src/doc/Makefile b/src/doc/Makefile +index aac73bf..39042bf 100644 +--- a/src/doc/Makefile ++++ b/src/doc/Makefile +@@ -1,3 +1,9 @@ ++# Command-line flag to silence nested $(MAKE). ++$(VERBOSE)MAKESILENT = -s ++ ++# Suppress display of executed commands. ++$(VERBOSE).SILENT: ++ + PHPDIR = $(BUILDDIR)/src/doc + HTMLDIR = $(BUILDDIR)/html + +@@ -7,15 +13,15 @@ target: all + + # Common rules + $(PHPDIR)/Makefile: +- @echo "Preparing PHP documentation generator" +- @mkdir -p $(PHPDIR) +- @mkdir -p $(HTMLDIR) +- @cp -rf * $(PHPDIR)/ +- @cp -r $(addprefix $(ROOTDIR)/, $(RELEASE_TEXT)) $(PHPDIR)/ +- @cp -rf $(RESDIR)/doc/* $(HTMLDIR)/ +- @cp -f $(PHP_PLUGINS) $(PHPDIR)/config/plugins.php +- @$(PHP) -f makefile.php $(PHPDIR) >$(PHPDIR)/Makefile ++ echo "Preparing PHP documentation generator" ++ mkdir -p $(PHPDIR) ++ mkdir -p $(HTMLDIR) ++ cp -rf * $(PHPDIR)/ ++ cp -r $(addprefix $(ROOTDIR)/, $(RELEASE_TEXT)) $(PHPDIR)/ ++ cp -rf $(RESDIR)/doc/* $(HTMLDIR)/ ++ cp -f $(PHP_PLUGINS) $(PHPDIR)/config/plugins.php ++ $(PHP) -f makefile.php $(PHPDIR) >$(PHPDIR)/Makefile + + all: $(PHPDIR)/Makefile +- @echo "Generating HTML documentation" +- @$(MAKE) $(MAKE_OPTS) -C $(PHPDIR) ++ echo "Generating HTML documentation" ++ $(MAKE) $(MAKESILENT) $(MAKE_OPTS) -C $(PHPDIR) +diff --git a/src/dsp/Makefile b/src/dsp/Makefile +index f3d9ab1..f339a85 100644 +--- a/src/dsp/Makefile ++++ b/src/dsp/Makefile +@@ -1,3 +1,9 @@ ++# Command-line flag to silence nested $(MAKE). ++$(VERBOSE)MAKESILENT = -s ++ ++# Suppress display of executed commands. ++$(VERBOSE).SILENT: ++ + NATIVE_IMPL = $(OBJDIR)/native.o + + X86_IMPL = $(OBJDIR)/x86.o +@@ -58,42 +64,42 @@ target: all + all: $(OBJ_DSP) + + $(OBJ_DSP): $(LINK_OBJECTS) +- @echo " $(LD) $(notdir $(OBJ_DSP))" +- @$(LD) -o $(OBJ_DSP) -r $(MERGE_FLAGS) $(LINK_OBJECTS) ++ echo " $(LD) $(notdir $(OBJ_DSP))" ++ $(LD) -o $(OBJ_DSP) -r $(MERGE_FLAGS) $(LINK_OBJECTS) + + $(DSP_IMPL) $(BITS_IMPL) $(NATIVE_IMPL) $(X86_IMPL) $(ARM_IMPL) $(AARCH64_IMPL): +- @echo " $(CXX) $(FILE)" +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) ++ echo " $(CXX) $(FILE)" ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) + + $(SSE_IMPL): +- @echo " $(CXX) $(FILE)" +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(SSE_INSTR_SET) $(INCLUDE) ++ echo " $(CXX) $(FILE)" ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(SSE_INSTR_SET) $(INCLUDE) + + $(SSE2_IMPL): +- @echo " $(CXX) $(FILE)" +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(SSE2_INSTR_SET) $(INCLUDE) ++ echo " $(CXX) $(FILE)" ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(SSE2_INSTR_SET) $(INCLUDE) + + $(SSE3_IMPL): +- @echo " $(CXX) $(FILE)" +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(SSE3_INSTR_SET) $(INCLUDE) ++ echo " $(CXX) $(FILE)" ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(SSE3_INSTR_SET) $(INCLUDE) + + $(SSE4_IMPL): +- @echo " $(CXX) $(FILE)" +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(SSE4_INSTR_SET) $(INCLUDE) ++ echo " $(CXX) $(FILE)" ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(SSE4_INSTR_SET) $(INCLUDE) + + $(AVX_IMPL): +- @echo " $(CXX) $(FILE)" +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(AVX_INSTR_SET) $(INCLUDE) ++ echo " $(CXX) $(FILE)" ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(AVX_INSTR_SET) $(INCLUDE) + + $(AVX2_IMPL): +- @echo " $(CXX) $(FILE)" +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(AVX2_INSTR_SET) $(INCLUDE) ++ echo " $(CXX) $(FILE)" ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(AVX2_INSTR_SET) $(INCLUDE) + + $(NEON_D32_IMPL): +- @echo " $(CXX) $(FILE)" +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(NEON_D32_INSTR_SET) $(INCLUDE) ++ echo " $(CXX) $(FILE)" ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(NEON_D32_INSTR_SET) $(INCLUDE) + + $(ASIMD_IMPL): +- @echo " $(CXX) $(FILE)" +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(ASIMD_INSTR_SET) $(INCLUDE) ++ echo " $(CXX) $(FILE)" ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(ASIMD_INSTR_SET) $(INCLUDE) + +diff --git a/src/metadata/Makefile b/src/metadata/Makefile +index 201f89a..5731ef8 100644 +--- a/src/metadata/Makefile ++++ b/src/metadata/Makefile +@@ -1,3 +1,9 @@ ++# Command-line flag to silence nested $(MAKE). ++$(VERBOSE)MAKESILENT = -s ++ ++# Suppress display of executed commands. ++$(VERBOSE).SILENT: ++ + rwildcard = $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) + FILES = $(addprefix $(OBJDIR)/, $(patsubst %.cpp, %.o, $(wildcard *.cpp))) + FILE = $(@:$(OBJDIR)/%.o=%.cpp) +@@ -9,9 +15,9 @@ all: $(OBJ_METADATA) + target: all + + $(OBJ_METADATA): $(FILES) +- @echo " $(LD) $(notdir $(OBJ_METADATA))" +- @$(LD) -o $(OBJ_METADATA) -r $(MERGE_FLAGS) $(FILES) ++ echo " $(LD) $(notdir $(OBJ_METADATA))" ++ $(LD) -o $(OBJ_METADATA) -r $(MERGE_FLAGS) $(FILES) + + $(FILES): +- @echo " $(CXX) $(FILE)" +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) ++ echo " $(CXX) $(FILE)" ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) +diff --git a/src/plugins/Makefile b/src/plugins/Makefile +index 1f197dc..25c4ab6 100644 +--- a/src/plugins/Makefile ++++ b/src/plugins/Makefile +@@ -1,3 +1,9 @@ ++# Command-line flag to silence nested $(MAKE). ++$(VERBOSE)MAKESILENT = -s ++ ++# Suppress display of executed commands. ++$(VERBOSE).SILENT: ++ + rwildcard = $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) + FILES = $(addprefix $(OBJDIR)/, $(patsubst %.cpp, %.o, $(wildcard *.cpp))) + FILE = $(@:$(OBJDIR)/%.o=%.cpp) +@@ -7,9 +13,9 @@ FILE = $(@:$(OBJDIR)/%.o=%.cpp) + all: $(OBJ_PLUGINS) + + $(OBJ_PLUGINS): $(FILES) $(SUBDIRS) +- @echo " $(LD) $(notdir $(OBJ_PLUGINS))" +- @$(LD) -o $(OBJ_PLUGINS) -r $(MERGE_FLAGS) $(FILES) ++ echo " $(LD) $(notdir $(OBJ_PLUGINS))" ++ $(LD) -o $(OBJ_PLUGINS) -r $(MERGE_FLAGS) $(FILES) + + $(FILES): +- @echo " $(CXX) $(FILE)" +- @$(CXX) -o $(@) -c -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(FILE) ++ echo " $(CXX) $(FILE)" ++ $(CXX) -o $(@) -c -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(FILE) +diff --git a/src/rendering/Makefile b/src/rendering/Makefile +index 897e327..257b7f7 100644 +--- a/src/rendering/Makefile ++++ b/src/rendering/Makefile +@@ -1,3 +1,9 @@ ++# Command-line flag to silence nested $(MAKE). ++$(VERBOSE)MAKESILENT = -s ++ ++# Suppress display of executed commands. ++$(VERBOSE).SILENT: ++ + BASE_IMPL = $(OBJDIR)/base_backend.o + + GLX_IMPL = $(OBJDIR)/glx/backend.o $(OBJDIR)/glx/factory.o +@@ -19,16 +25,16 @@ target: all + all: $(MODULES) + + $(LIB_R3D_GLX): $(BASE_IMPL) $(GLX_IMPL) +- @echo " $(CXX) $(notdir $(LIB_R3D_GLX))" +- @$(CXX) -o $(LIB_R3D_GLX) $(BASE_IMPL) $(GLX_IMPL) $(SO_FLAGS) $(XLIB_LIBS) $(OPENGL_LIBS) ++ echo " $(CXX) $(notdir $(LIB_R3D_GLX))" ++ $(CXX) -o $(LIB_R3D_GLX) $(BASE_IMPL) $(GLX_IMPL) $(SO_FLAGS) $(XLIB_LIBS) $(OPENGL_LIBS) + + $(BASE_IMPL): +- @echo " $(CXX) $(FILE)" +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) ++ echo " $(CXX) $(FILE)" ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) + + $(GLX_IMPL): +- @echo " $(CXX) $(FILE)" +- @mkdir -p $(dir $(@)) +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(XLIB_HEADERS) $(OPENGL_HEADERS) ++ echo " $(CXX) $(FILE)" ++ mkdir -p $(dir $(@)) ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(XLIB_HEADERS) $(OPENGL_HEADERS) + + +diff --git a/src/test/Makefile b/src/test/Makefile +index e8016e1..6f8588b 100644 +--- a/src/test/Makefile ++++ b/src/test/Makefile +@@ -1,3 +1,9 @@ ++# Command-line flag to silence nested $(MAKE). ++$(VERBOSE)MAKESILENT = -s ++ ++# Suppress display of executed commands. ++$(VERBOSE).SILENT: ++ + rwildcard = $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) + FILES = $(addprefix $(OBJDIR)/, $(patsubst %.cpp, %.o, $(call rwildcard, , *.cpp))) + FILE = $(@:$(OBJDIR)/%.o=%.cpp) +@@ -7,11 +13,11 @@ FILE = $(@:$(OBJDIR)/%.o=%.cpp) + all: $(OBJ_TEST_CORE) + + $(FILES): +- @echo " $(CXX) $(FILE)" +- @mkdir -p $(dir $@) +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(OPENGL_HEADERS) ++ echo " $(CXX) $(FILE)" ++ mkdir -p $(dir $@) ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(OPENGL_HEADERS) + + $(OBJ_TEST_CORE): $(FILES) +- @echo " $(LD) $(notdir $(OBJ_TEST_CORE))" +- @$(LD) -o $(OBJ_TEST_CORE) -r $(MERGE_FLAGS) $(FILES) ++ echo " $(LD) $(notdir $(OBJ_TEST_CORE))" ++ $(LD) -o $(OBJ_TEST_CORE) -r $(MERGE_FLAGS) $(FILES) + +diff --git a/src/testing/Makefile b/src/testing/Makefile +index 705913d..d2cbfc9 100644 +--- a/src/testing/Makefile ++++ b/src/testing/Makefile +@@ -1,3 +1,9 @@ ++# Command-line flag to silence nested $(MAKE). ++$(VERBOSE)MAKESILENT = -s ++ ++# Suppress display of executed commands. ++$(VERBOSE).SILENT: ++ + rwildcard = $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) + FILES = $(addprefix $(OBJDIR)/, $(patsubst %.cpp, %.o, $(call rwildcard, , *.cpp))) + FILE = $(@:$(OBJDIR)/%.o=%.cpp) +@@ -7,11 +13,11 @@ FILE = $(@:$(OBJDIR)/%.o=%.cpp) + all: $(OBJ_TESTING_CORE) + + $(FILES): +- @echo " $(CXX) $(FILE)" +- @mkdir -p $(dir $@) +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(OPENGL_HEADERS) ++ echo " $(CXX) $(FILE)" ++ mkdir -p $(dir $@) ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(OPENGL_HEADERS) + + $(OBJ_TESTING_CORE): $(FILES) +- @echo " $(LD) $(notdir $(OBJ_TESTING_CORE))" +- @$(LD) -o $(OBJ_TESTING_CORE) -r $(MERGE_FLAGS) $(FILES) ++ echo " $(LD) $(notdir $(OBJ_TESTING_CORE))" ++ $(LD) -o $(OBJ_TESTING_CORE) -r $(MERGE_FLAGS) $(FILES) + +diff --git a/src/ui/Makefile b/src/ui/Makefile +index 503111d..b36de92 100644 +--- a/src/ui/Makefile ++++ b/src/ui/Makefile +@@ -1,3 +1,9 @@ ++# Command-line flag to silence nested $(MAKE). ++$(VERBOSE)MAKESILENT = -s ++ ++# Suppress display of executed commands. ++$(VERBOSE).SILENT: ++ + FILES = $(addprefix $(OBJDIR)/, $(patsubst %.cpp, %.o, $(wildcard *.cpp))) + FILE = $(@:$(OBJDIR)/%.o=%.cpp) + SUBDIRS = ws tk ctl plugins +@@ -7,16 +13,16 @@ PACKAGES = $(OBJ_WS_CORE) $(OBJ_TK_CORE) $(OBJ_CTL_CORE) + .PHONY: all $(SUBDIRS) + + $(SUBDIRS): +- @echo "Building $@" +- @mkdir -p $(OBJDIR)/$(@) +- @$(MAKE) $(MAKE_OPTS) -C $@ $(MAKECMDGOALS) OBJDIR=$(OBJDIR)/$(@) ++ echo "Building $@" ++ mkdir -p $(OBJDIR)/$(@) ++ $(MAKE) $(MAKESILENT) $(MAKE_OPTS) -C $@ $(MAKECMDGOALS) OBJDIR=$(OBJDIR)/$(@) + + $(FILES): +- @echo " $(CXX) $(FILE)" +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) ++ echo " $(CXX) $(FILE)" ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) + + $(OBJ_UI_CORE): $(FILES) $(SUBDIRS) +- @echo " $(LD) $(notdir $(@))" +- @$(LD) -o $(OBJ_UI_CORE) $(OBJ_PLUGIN_UIS) $(MERGE_FLAGS) $(PACKAGES) $(FILES) ++ echo " $(LD) $(notdir $(@))" ++ $(LD) -o $(OBJ_UI_CORE) $(OBJ_PLUGIN_UIS) $(MERGE_FLAGS) $(PACKAGES) $(FILES) + + all: $(OBJ_UI_CORE) +diff --git a/src/ui/ctl/Makefile b/src/ui/ctl/Makefile +index 3f727db..b5d11c2 100644 +--- a/src/ui/ctl/Makefile ++++ b/src/ui/ctl/Makefile +@@ -1,3 +1,9 @@ ++# Command-line flag to silence nested $(MAKE). ++$(VERBOSE)MAKESILENT = -s ++ ++# Suppress display of executed commands. ++$(VERBOSE).SILENT: ++ + FILES = $(addprefix $(OBJDIR)/, $(patsubst %.cpp, %.o, $(wildcard *.cpp))) + FILE = $(@:$(OBJDIR)/%.o=%.cpp) + SUBDIRS = +@@ -5,11 +11,11 @@ SUBDIRS = + .PHONY: all + + $(FILES): +- @echo " $(CXX) $(FILE)" +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) ++ echo " $(CXX) $(FILE)" ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) + + $(OBJ_CTL_CORE): $(FILES) +- @echo " $(LD) $(notdir $(@))" +- @$(LD) -o $(OBJ_CTL_CORE) $(MERGE_FLAGS) $(PACKAGES) $(FILES) ++ echo " $(LD) $(notdir $(@))" ++ $(LD) -o $(OBJ_CTL_CORE) $(MERGE_FLAGS) $(PACKAGES) $(FILES) + + all: $(OBJ_CTL_CORE) $(SUBDIRS) +diff --git a/src/ui/plugins/Makefile b/src/ui/plugins/Makefile +index 8f8db8f..ab1277e 100644 +--- a/src/ui/plugins/Makefile ++++ b/src/ui/plugins/Makefile +@@ -1,3 +1,9 @@ ++# Command-line flag to silence nested $(MAKE). ++$(VERBOSE)MAKESILENT = -s ++ ++# Suppress display of executed commands. ++$(VERBOSE).SILENT: ++ + FILES = $(addprefix $(OBJDIR)/, $(patsubst %.cpp, %.o, $(wildcard *.cpp))) + FILE = $(@:$(OBJDIR)/%.o=%.cpp) + SUBDIRS = +@@ -5,11 +11,11 @@ SUBDIRS = + .PHONY: all + + $(FILES): +- @echo " $(CXX) $(FILE)" +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) ++ echo " $(CXX) $(FILE)" ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) + + $(OBJ_PLUGIN_UIS): $(FILES) +- @echo " $(LD) $(notdir $(@))" +- @$(LD) -o $(OBJ_PLUGIN_UIS) $(MERGE_FLAGS) $(PACKAGES) $(FILES) ++ echo " $(LD) $(notdir $(@))" ++ $(LD) -o $(OBJ_PLUGIN_UIS) $(MERGE_FLAGS) $(PACKAGES) $(FILES) + + all: $(OBJ_PLUGIN_UIS) $(SUBDIRS) +diff --git a/src/ui/tk/Makefile b/src/ui/tk/Makefile +index 8700f63..968487f 100644 +--- a/src/ui/tk/Makefile ++++ b/src/ui/tk/Makefile +@@ -1,3 +1,9 @@ ++# Command-line flag to silence nested $(MAKE). ++$(VERBOSE)MAKESILENT = -s ++ ++# Suppress display of executed commands. ++$(VERBOSE).SILENT: ++ + rwildcard = $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) + FILES = $(addprefix $(OBJDIR)/, $(patsubst %.cpp, %.o, $(call rwildcard, , *.cpp))) + FILE = $(@:$(OBJDIR)/%.o=%.cpp) +@@ -5,12 +11,12 @@ FILE = $(@:$(OBJDIR)/%.o=%.cpp) + .PHONY: all + + $(FILES): +- @echo " $(CXX) $(FILE)" +- @mkdir -p $(dir $@) +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) ++ echo " $(CXX) $(FILE)" ++ mkdir -p $(dir $@) ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) + + $(OBJ_TK_CORE): $(FILES) +- @echo " $(LD) $(notdir $(@))" +- @$(LD) -o $(OBJ_TK_CORE) $(MERGE_FLAGS) $(PACKAGES) $(FILES) ++ echo " $(LD) $(notdir $(@))" ++ $(LD) -o $(OBJ_TK_CORE) $(MERGE_FLAGS) $(PACKAGES) $(FILES) + + all: $(OBJ_TK_CORE) +diff --git a/src/ui/ws/Makefile b/src/ui/ws/Makefile +index 1109752..95bdae1 100644 +--- a/src/ui/ws/Makefile ++++ b/src/ui/ws/Makefile +@@ -1,3 +1,9 @@ ++# Command-line flag to silence nested $(MAKE). ++$(VERBOSE)MAKESILENT = -s ++ ++# Suppress display of executed commands. ++$(VERBOSE).SILENT: ++ + FILES = $(addprefix $(OBJDIR)/, $(patsubst %.cpp, %.o, $(wildcard *.cpp))) + FILE = $(@:$(OBJDIR)/%.o=%.cpp) + SUBDIRS = x11 +@@ -7,16 +13,16 @@ SUBDIRS = x11 + all: $(OBJ_WS_CORE) + + $(SUBDIRS): +- @echo "Building $@" +- @mkdir -p $(OBJDIR)/$(@) +- @$(MAKE) $(MAKE_OPTS) -C $@ $(MAKECMDGOALS) OBJDIR=$(OBJDIR)/$(@) ++ echo "Building $@" ++ mkdir -p $(OBJDIR)/$(@) ++ $(MAKE) $(MAKESILENT) $(MAKE_OPTS) -C $@ $(MAKECMDGOALS) OBJDIR=$(OBJDIR)/$(@) + + $(FILES): +- @echo " $(CXX) $(FILE)" +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) ++ echo " $(CXX) $(FILE)" ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) + + $(OBJ_WS_CORE): $(FILES) $(OBJ_WS_X11_CORE) +- @echo " $(LD) $(notdir $(@))" +- @$(LD) -o $(OBJ_WS_CORE) $(MERGE_FLAGS) $(PACKAGES) $(OBJ_WS_X11_CORE) $(FILES) ++ echo " $(LD) $(notdir $(@))" ++ $(LD) -o $(OBJ_WS_CORE) $(MERGE_FLAGS) $(PACKAGES) $(OBJ_WS_X11_CORE) $(FILES) + + $(OBJ_WS_X11_CORE): $(SUBDIRS) +diff --git a/src/ui/ws/x11/Makefile b/src/ui/ws/x11/Makefile +index b99e93d..a576121 100644 +--- a/src/ui/ws/x11/Makefile ++++ b/src/ui/ws/x11/Makefile +@@ -1,3 +1,9 @@ ++# Command-line flag to silence nested $(MAKE). ++$(VERBOSE)MAKESILENT = -s ++ ++# Suppress display of executed commands. ++$(VERBOSE).SILENT: ++ + FILES = $(addprefix $(OBJDIR)/, $(patsubst %.cpp, %.o, $(wildcard *.cpp))) + FILE = $(@:$(OBJDIR)/%.o=%.cpp) + INCLUDE += $(XLIB_HEADERS) $(CAIRO_HEADERS) +@@ -7,10 +13,10 @@ INCLUDE += $(XLIB_HEADERS) $(CAIRO_HEADERS) + all: $(OBJ_WS_X11_CORE) + + $(OBJ_WS_X11_CORE): $(FILES) +- @echo " $(LD) $(notdir $(@))" +- @$(LD) -o $(OBJ_WS_X11_CORE) $(MERGE_FLAGS) -r $(FILES) ++ echo " $(LD) $(notdir $(@))" ++ $(LD) -o $(OBJ_WS_X11_CORE) $(MERGE_FLAGS) -r $(FILES) + + $(FILES): +- @echo " $(CXX) $(FILE)" +- @$(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) ++ echo " $(CXX) $(FILE)" ++ $(CXX) -o $(@) -c $(FILE) -fPIC $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) + +diff --git a/src/utils/Makefile b/src/utils/Makefile +index 88b3739..d493b88 100644 +--- a/src/utils/Makefile ++++ b/src/utils/Makefile +@@ -1,3 +1,9 @@ ++# Command-line flag to silence nested $(MAKE). ++$(VERBOSE)MAKESILENT = -s ++ ++# Suppress display of executed commands. ++$(VERBOSE).SILENT: ++ + MODULES = $(UTL_RESGEN) + FILELIST = resource_gen.o + FILE = $(@:$(OBJDIR)/%.o=%.cpp) +@@ -43,33 +49,33 @@ target: all + + # Common rules + $(SUBDIRS): +- @echo "Building $@" +- @mkdir -p $(OBJDIR)/$(@) +- @$(MAKE) $(MAKE_OPTS) -C $@ $(MAKECMDGOALS) OBJDIR=$(OBJDIR)/$(@) ++ echo "Building $@" ++ mkdir -p $(OBJDIR)/$(@) ++ $(MAKE) $(MAKESILENT) $(MAKE_OPTS) -C $@ $(MAKECMDGOALS) OBJDIR=$(OBJDIR)/$(@) + + $(FILES): +- @echo " $(CXX) $(FILE)" +- @$(CXX) -o $(@) -c $(FILE) $(CPPFLAGS) -fPIC $(CXXFLAGS) $(INCLUDE) $(INCLUDE_EXTRA) ++ echo " $(CXX) $(FILE)" ++ $(CXX) -o $(@) -c $(FILE) $(CPPFLAGS) -fPIC $(CXXFLAGS) $(INCLUDE) $(INCLUDE_EXTRA) + + # Rules for each utility + $(UTL_GENTTL): $(FILES) $(SUBDIRS) +- @echo " $(CXX) $(notdir $(UTL_GENTTL))" +- @$(CXX) -o $(UTL_GENTTL) $(OBJDIR)/lv2_genttl.o $(OBJ_FILES) $(EXE_FLAGS) $(SNDFILE_LIBS) $(DL_LIBS) $(OBJ_LIBS) $(LV2_LIBS) ++ echo " $(CXX) $(notdir $(UTL_GENTTL))" ++ $(CXX) -o $(UTL_GENTTL) $(OBJDIR)/lv2_genttl.o $(OBJ_FILES) $(EXE_FLAGS) $(SNDFILE_LIBS) $(DL_LIBS) $(OBJ_LIBS) $(LV2_LIBS) + + $(UTL_JACKMAKE): $(FILES) $(SUBDIRS) +- @echo " $(CXX) $(notdir $(UTL_JACKMAKE))" +- @$(CXX) -o $(UTL_JACKMAKE) $(OBJDIR)/jack_genmake.o $(OBJ_FILES) $(EXE_FLAGS) $(SNDFILE_LIBS) $(DL_LIBS) $(OBJ_LIBS) ++ echo " $(CXX) $(notdir $(UTL_JACKMAKE))" ++ $(CXX) -o $(UTL_JACKMAKE) $(OBJDIR)/jack_genmake.o $(OBJ_FILES) $(EXE_FLAGS) $(SNDFILE_LIBS) $(DL_LIBS) $(OBJ_LIBS) + + $(UTL_VSTMAKE): $(FILES) $(SUBDIRS) +- @echo " $(CXX) $(notdir $(UTL_VSTMAKE))" +- @$(CXX) -o $(UTL_VSTMAKE) $(OBJDIR)/vst_genmake.o $(OBJ_FILES) $(EXE_FLAGS) $(DL_LIBS) $(OBJ_LIBS) ++ echo " $(CXX) $(notdir $(UTL_VSTMAKE))" ++ $(CXX) -o $(UTL_VSTMAKE) $(OBJDIR)/vst_genmake.o $(OBJ_FILES) $(EXE_FLAGS) $(DL_LIBS) $(OBJ_LIBS) + + $(UTL_GENPHP): $(FILES) $(SUBDIRS) +- @echo " $(CXX) $(notdir $(UTL_GENPHP))" +- @$(CXX) -o $(UTL_GENPHP) $(OBJDIR)/gen_php.o $(OBJ_FILES) $(EXE_FLAGS) $(SNDFILE_LIBS) $(DL_LIBS) $(OBJ_LIBS) ++ echo " $(CXX) $(notdir $(UTL_GENPHP))" ++ $(CXX) -o $(UTL_GENPHP) $(OBJDIR)/gen_php.o $(OBJ_FILES) $(EXE_FLAGS) $(SNDFILE_LIBS) $(DL_LIBS) $(OBJ_LIBS) + + $(UTL_RESGEN): $(FILES) $(SUBDIRS) +- @echo " $(CXX) $(notdir $(UTL_RESGEN))" +- @$(CXX) -o $(UTL_RESGEN) $(OBJDIR)/resource_gen.o $(OBJ_FILES) $(OBJ_DSP) $(OBJ_EXTRA) $(EXE_FLAGS) $(SNDFILE_LIBS) $(DL_LIBS) $(OBJ_LIBS) ++ echo " $(CXX) $(notdir $(UTL_RESGEN))" ++ $(CXX) -o $(UTL_RESGEN) $(OBJDIR)/resource_gen.o $(OBJ_FILES) $(OBJ_DSP) $(OBJ_EXTRA) $(EXE_FLAGS) $(SNDFILE_LIBS) $(DL_LIBS) $(OBJ_LIBS) + +- +\ No newline at end of file ++ diff --git a/srcpkgs/lsp-plugins/template b/srcpkgs/lsp-plugins/template new file mode 100644 index 000000000000..10fbcee0aedb --- /dev/null +++ b/srcpkgs/lsp-plugins/template @@ -0,0 +1,25 @@ +# Template file for 'lsp-plugins' +pkgname=lsp-plugins +version=1.1.30 +revision=1 +build_style=gnu-makefile +hostmakedepends="pkg-config php" +makedepends="libsndfile-devel libX11-devel libglvnd-devel lv2 cairo-devel ladspa-sdk jack-devel" +make_build_args="VERBOSE=1" +short_desc="Collection of free plugins compatible with LADSPA, LV2 and LinuxVST" +maintainer="Artur Sinila " +license="LGPL-3.0-or-later" +homepage="https://lsp-plug.in/" +distfiles="https://github.com/sadko4u/lsp-plugins/archive/refs/tags/${version}.tar.gz" +checksum=9cf43257729093c240375b3640b1514dff34b092b83b54a5ee68d7e8565c8f80 + +export BUILD_ARCH="${XBPS_TARGET_MACHINE%%-musl}" + +# https://github.com/sadko4u/lsp-plugins/issues/191#issuecomment-812847630 +CXXFLAGS="-std=c++98" + +do_check() { + export CXXFLAGS="$CXXFLAGS -DLSP_TESTING -DLSP_TRACE" + make VERBOSE=1 test + .test/lsp-plugins-test utest +}