Updated build scripts and dependencies

Author: sadko4u

.github/workflows/build.yml

@@ -30,7 +30,7 @@ jobs:
         run: pacman --noconfirm -Syu alsa-lib base-devel cairo carla git glibc-debug hicolor-icon-theme jack2 jq libglvnd libsndfile libx11 libxrandr lv2lint php valgrind gstreamer gst-plugins-base
       - uses: actions/checkout@v3
       - name: Configure project
-        run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr
+        run: make config FEATURES='strict clap doc gst jack ladspa lv2 standalone ui vst2 vst3 xdg' PREFIX=/usr
       - name: Fetch project dependencies
         run: make fetch
       - name: Build project
@@ -75,7 +75,7 @@ jobs:
         run: pacman --noconfirm -Syu alsa-lib base-devel cairo carla git glibc-debug hicolor-icon-theme jack2 jq libglvnd libsndfile libx11 libxrandr php valgrind gstreamer gst-plugins-base
       - uses: actions/checkout@v3
       - name: Configure project
-        run: make config STRICT=1 DEBUG=1 VERBOSE=1 ASAN=1 FEATURES='clap jack gst ladspa ui lv2 vst2 vst3' PREFIX=/usr
+        run: make config FEATURES='strict debug clap gst jack ladspa lv2 standalone ui vst2 vst3 xdg' PREFIX=/usr
       - name: Fetch project dependencies
         run: make fetch
       - name: Build project
@@ -103,7 +103,7 @@ jobs:
             /usr/lib/carla/carla-bridge-native vst2 "${_binary}" "" 1>/dev/null; \
           done
 
-  arch_linux_valgrind:
+  arch_linux_debug:
     runs-on: ubuntu-latest
     container:
       image: archlinux:latest
@@ -116,7 +116,7 @@ jobs:
         run: pacman --noconfirm -Syu alsa-lib base-devel cairo carla git glibc-debug hicolor-icon-theme jack2 jq libglvnd libsndfile libx11 libxrandr php valgrind gstreamer gst-plugins-base
       - uses: actions/checkout@v3
       - name: Configure project
-        run: make config STRICT=1 DEBUG=1 VERBOSE=1 FEATURES='clap jack gst ladspa lv2 ui vst2 vst3' PREFIX=/usr
+        run: make config VERBOSE=1 FEATURES='strict debug clap jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr
       - name: Fetch project dependencies
         run: make fetch
       - name: Build project
@@ -150,7 +150,7 @@ jobs:
         run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ glibc-locale git make php valgrind libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel
       - uses: actions/checkout@v3
       - name: Configure project
-        run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr
+        run: make config FEATURES='strict clap doc gst jack ladspa lv2 standalone ui vst2 vst3 xdg' PREFIX=/usr
       - name: Fetch project dependencies
         run: make fetch
       - name: Build project
@@ -167,7 +167,7 @@ jobs:
         run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ glibc-locale glibc-gconv-modules-extra clang lld git make php8-cli valgrind libstdc++-devel libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel
       - uses: actions/checkout@v3
       - name: Configure project
-        run: make config CC=clang CXX=clang++ STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr
+        run: make config CC=clang CXX=clang++ FEATURES='strict clap doc gst jack ladspa lv2 standalone ui vst2 vst3 xdg' PREFIX=/usr
       - name: Fetch project dependencies
         run: make fetch
       - name: Build project
@@ -186,7 +186,26 @@ jobs:
         run: apt-get -y install gcc g++ git make php-cli pkg-config valgrind libx11-dev libxrandr-dev libjack-dev libcairo2-dev libgl-dev libfreetype6-dev libsndfile1-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev
       - uses: actions/checkout@v3
       - name: Configure project
-        run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr
+        run: make config FEATURES='strict clap doc gst jack ladspa lv2 standalone ui vst2 vst3 xdg' PREFIX=/usr
+      - name: Fetch project dependencies
+        run: make fetch
+      - name: Build project
+        run: make VERBOSE=1
+      - name: Install binaries
+        run: make install
+
+  debian_stable_no_ui:
+    runs-on: ubuntu-latest
+    container:
+      image: debian:stable
+    steps:
+      - name: Update repositories
+        run: apt-get update
+      - name: Install dependencies
+        run: apt-get -y install gcc g++ git make php-cli pkg-config valgrind libx11-dev libxrandr-dev libjack-dev libcairo2-dev libgl-dev libfreetype6-dev libsndfile1-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev
+      - uses: actions/checkout@v3
+      - name: Configure project
+        run: make config FEATURES='strict clap doc gst jack ladspa lv2 standalone vst2 vst3' PREFIX=/usr
       - name: Fetch project dependencies
         run: make fetch
       - name: Build project
@@ -213,7 +232,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Configure project
         shell: msys2 {0}
-        run: make config STRICT=1 VERBOSE=1 FEATURES='clap ladspa lv2 ui vst2 vst3'
+        run: make config FEATURES='strict clap ladspa lv2 ui vst2 vst3'
       - name: Fetch project dependencies
         shell: msys2 {0}
         run: make fetch
@@ -230,7 +249,7 @@ jobs:
         run: brew install make pkgconf cairo freetype
       - uses: actions/checkout@v3
       - name: Configure project
-        run: gmake config STRICT=1 VERBOSE=1 FEATURES='lv2 ui'
+        run: gmake config FEATURES='strict lv2 ui'
       - name: Fetch project dependencies
         run: gmake fetch
       - name: Build project

Makefile

@@ -100,18 +100,18 @@ testconfig: CONFIG_FLAGS=TEST=1
 devel: CONFIG_FLAGS=TEST=1 DEVEL=1
 
 config testconfig devel:
-	$(MAKE) -f "make/configure.mk" config VERBOSE="$(VERBOSE)" CONFIG="$(CONFIG)" -$(MAKEFLAGS)
+	$(MAKE) -f "$(BASEDIR)/make/configure.mk" config VERBOSE="$(VERBOSE)" CONFIG="$(CONFIG)" -$(MAKEFLAGS)
 
 # Release-related targets
 .PHONY: distsrc
 distsrc:
 	echo "Building source code archive"
 	mkdir -p "$(DISTSRC)/modules"
-	$(MAKE) -f "make/modules.mk" tree VERBOSE="$(VERBOSE)" BASEDIR="$(BASEDIR)" MODULES="$(DISTSRC)/modules" TREE="1"
+	$(MAKE) -f "make/modules.mk" tree TREE="1" BUILD_FEATURES="$(FEATURES)" VERBOSE="$(VERBOSE)" BASEDIR="$(BASEDIR)" MODULES="$(DISTSRC)/modules"
 	$(if $(DISTSRC_DIRS), cp -R $(DISTSRC_DIRS) "$(DISTSRC)/")
 	$(if $(DISTSRC_FILES), cp $(DISTSRC_FILES) "$(DISTSRC)/")
-	find "$(DISTSRC)" -iname '.git' | xargs rm -rf {}
-	find "$(DISTSRC)" -iname '.gitignore' | xargs rm -rf {}
+	find "$(DISTSRC)" -iname '.git' | xargs -exec rm -rf {}
+	find "$(DISTSRC)" -iname '.gitignore' | xargs -exec rm -rf {}
 	tar -C $(DISTSRC_PATH) -czf "$(BUILDDIR)/$(ARTIFACT_NAME)-src-$(ARTIFACT_VERSION).tar.gz" "$(ARTIFACT_NAME)"
 	echo "Created archive: $(BUILDDIR)/$(ARTIFACT_NAME)-src-$(ARTIFACT_VERSION).tar.gz"
 	rm -rf $(DISTSRC_PATH)
@@ -139,13 +139,14 @@ help:
 	$(MAKE) -f "$(BASEDIR)/make/configure.mk" $(@) VERBOSE="$(VERBOSE)"
 	echo ""
 	echo "Available FEATURES:"
-	echo "  clap                      CLAP plugin format binaries"
+	echo "  clap                      CLAP plugins"
 	echo "  doc                       Generate standalone HTML documentation"
 	echo "  gst                       GStreamer plugins"
-	echo "  jack                      Standalone JACK plugins"
+	echo "  jack                      JACK audio backend for standalone plugins"
 	echo "  ladspa                    LADSPA plugins"
+	echo "  launcher                  Build launcher application for standalone plugin applications"
 	echo "  lv2                       LV2 plugins"
-	echo "  ui                        Build plugins with UI"
+	echo "  standalone                Standalone plugin applications"
 	echo "  vst2                      VST 2.x plugin binaries"
 	echo "  vst3                      VST 3.x plugin binaries"
 	echo "  xdg                       Desktop integration icons"

dependencies.mk

@@ -21,18 +21,19 @@
 #------------------------------------------------------------------------------
 # List of all dependencies
 DEPENDENCIES = \
+  LSP_3RD_PARTY \
   LSP_COMMON_LIB \
+  LSP_AUDIO_IFACE \
   LSP_DSP_LIB \
   LSP_DSP_UNITS \
   LSP_LLTL_LIB \
-  LSP_RUNTIME_LIB \
-  LSP_PLUGINS_SHARED \
-  LSP_3RD_PARTY \
   LSP_PLUGIN_FW \
+  LSP_PLUGINS_SHARED \
+  LSP_R3D_BASE_LIB \
   LSP_R3D_IFACE \
-  LSP_WS_LIB \
+  LSP_RUNTIME_LIB \
   LSP_TK_LIB \
-  LSP_R3D_BASE_LIB
+  LSP_WS_LIB
 
 TEST_DEPENDENCIES = \
   LSP_TEST_FW
@@ -54,14 +55,15 @@ LINUX_DEPENDENCIES = \
   LIBSNDFILE \
   LIBX11 \
   LIBXRANDR \
+  LSP_AUDIO_JACK_LIB \
   LSP_R3D_GLX_LIB
 
 LINUX_TEST_DEPENDENCIES =
 
 ifeq ($(PLATFORM),Linux)
   DEPENDENCIES             += $(LINUX_DEPENDENCIES)
   TEST_DEPENDENCIES        += $(LINUX_TEST_DEPENDENCIES)
-  DEFAULT_FEATURES         += jack gst xdg
+  DEFAULT_FEATURES         += standalone gst xdg jack
 endif
 
 #------------------------------------------------------------------------------
@@ -80,37 +82,39 @@ BSD_DEPENDENCIES = \
   LIBSNDFILE \
   LIBX11 \
   LIBXRANDR \
+  LSP_AUDIO_JACK_LIB \
   LSP_R3D_GLX_LIB
 
 BSD_TEST_DEPENDENCIES = 
 
 ifeq ($(PLATFORM),BSD)
   DEPENDENCIES             += $(BSD_DEPENDENCIES)
   TEST_DEPENDENCIES        += $(BSD_TEST_DEPENDENCIES)
-  DEFAULT_FEATURES         += jack gst xdg
+  DEFAULT_FEATURES         += standalone gst xdg jack
 endif
 
 #------------------------------------------------------------------------------
 # Windows dependencies
 WINDOWS_DEPENDENCIES = \
-  LIBSHLWAPI \
-  LIBWINMM \
-  LIBMSACM \
-  LIBMPR \
-  LIBGDI32 \
   LIBD2D1 \
-  LIBOLE \
-  LIBWINCODEC \
   LIBDWRITE \
-  LIBUUID \
+  LIBGDI32 \
+  LIBMPR \
+  LIBMSACM \
+  LIBOLE \
   LIBOPENGL32 \
+  LIBSHLWAPI \
+  LIBUUID \
+  LIBWINCODEC \
+  LIBWINMM \
   LSP_R3D_WGL_LIB
 
 WINDOWS_TEST_DEPENDENCIES = 
 
 ifeq ($(PLATFORM),Windows)
   DEPENDENCIES             += $(WINDOWS_DEPENDENCIES)
   TEST_DEPENDENCIES        += $(WINDOWS_TEST_DEPENDENCIES)
+  DEFAULT_FEATURES         += 
 endif
 
 #------------------------------------------------------------------------------
@@ -123,13 +127,14 @@ MACOS_DEPENDENCIES = \
   LIBFONTCONFIG \
   LIBFREETYPE \
   LIBICONV \
-  LIBJACK  
+  LIBJACK
 
 MACOS_TEST_DEPENDENCIES =
 
 ifeq ($(PLATFORM),MacOS)
   DEPENDENCIES             += $(MACOS_DEPENDENCIES)
   TEST_DEPENDENCIES        += $(MACOS_TEST_DEPENDENCIES)
+  DEFAULT_FEATURES         += 
 endif
 
 #------------------------------------------------------------------------------
@@ -145,4 +150,4 @@ ALL_DEPENDENCIES = \
   $(BSD_TEST_DEPENDENCIES) \
   $(WINDOWS_TEST_DEPENDENCIES) \
   $(MACOS_TEST_DEPENDENCIES)
-
+  

make/configure.mk

@@ -24,10 +24,7 @@ endif
 BASEDIR                    := $(CURDIR)
 ROOTDIR                    := $(CURDIR)
 PLUGINS                    := $(BASEDIR)/plugins.mk
-TEST                       := 0
-DEBUG                      := 0
-PROFILE                    := 0
-TRACE                      := 0
+BUILD_FEATURES              = $(sort $(call subtraction,$(SUB_FEATURES),$(if $(FEATURES),$(FEATURES),$(DEFAULT_FEATURES)) $(ADD_FEATURES)))           
 
 # Configure system settings
 include $(BASEDIR)/project.mk
@@ -39,7 +36,7 @@ include $(BASEDIR)/modules.mk
 include $(BASEDIR)/dependencies.mk
 include $(PLUGINS)
 
-ifeq ($(DEVEL),1)
+ifeq ($(call fcheck,devel,$(BUILD_FEATURES),ON),ON)
   X_URL_SUFFIX                = _RW
 else
   X_URL_SUFFIX                = _RO
@@ -53,7 +50,6 @@ MERGED_DEPENDENCIES        := \
   $(PLUGIN_SHARED)
 UNIQ_MERGED_DEPENDENCIES   := $(call uniq, $(MERGED_DEPENDENCIES))
 DEPENDENCIES                = $(UNIQ_MERGED_DEPENDENCIES)
-BUILD_FEATURES             := $(sort $(call subtraction,$(SUB_FEATURES),$(if $(FEATURES),$(FEATURES),$(DEFAULT_FEATURES)) $(ADD_FEATURES)))
 
 # Determine versions
 ifeq ($(findstring -devel,$(ARTIFACT_VERSION)),-devel)
@@ -256,10 +252,10 @@ ifndef HOST_$(ARTIFACT_ID)_PATH
 endif
 
 ROOT_ARTIFACT_ID           := $(ARTIFACT_ID)
-$(ARTIFACT_ID)_TESTING      = $(TEST)
+$(ARTIFACT_ID)_TESTING      = $(call fcheck,test,$(BUILD_FEATURES),1,0)
 
 OVERALL_DEPS := $(call uniq,$(DEPENDENCIES) $(ARTIFACT_ID))
-__tmp := $(foreach dep,$(OVERALL_DEPS),$(call vardef, $(dep)))
+override __tmp := $(foreach dep,$(OVERALL_DEPS),$(call vardef, $(dep)))
 
 CONFIG_VARS = \
   $(PATH_VARS) \
@@ -318,6 +314,7 @@ $(CONFIG_VARS): prepare
 	echo "$(@)=$($(@))" >> "$(CONFIG)"
 
 config: $(CONFIG_VARS)
+	echo "Platform:          $(PLATFORM)"
 	echo "Host architecture: $(HOST_ARCHITECTURE_FAMILY)/$(HOST_ARCHITECTURE) ($(HOST_ARCHITECTURE_CFLAGS))"
 	echo "Architecture:      $(ARCHITECTURE_FAMILY)/$(ARCHITECTURE) ($(ARCHITECTURE_CFLAGS))"
 	echo "Features:          $(BUILD_FEATURES)"
@@ -354,4 +351,4 @@ help: | pathvars toolvars sysvars
 	echo ""
 	echo "Plugins used for build:"
 	echo "  $(PLUGINS_DEPENDENCIES)"
-
+	echo ""

make/functions.mk

@@ -45,11 +45,11 @@ cquery                  = $(foreach d,$(call uniq, $3),$(if $($(d)_$(strip $1)),
 
 # Find intersection between two sets
 # $(call intersection, list1, list2)
-intersection            = $(sort $(foreach v,$1,$(if $(findstring $(v),$2),$(v))))
+intersection            = $(sort $(foreach v,$1,$(if $(filter $(v),$2),$(v))))
 
 # Subtract the first set from second set
 # $(call subtraction, list1, list2)
-subtraction             = $(sort $(foreach v,$2,$(if $(findstring $(v),$1),,$(v))))
+subtraction             = $(sort $(foreach v,$2,$(if $(filter $(v),$1),,$(v))))
 
 # Check feature presence in list
 # $(call fcheck, features-to-check, all-feature-list, action-if-enabled, action-if-disabled)

make/modules.mk

@@ -48,7 +48,7 @@ UNIQ_ALL_DEPENDENCIES      := $(filter-out $(ARTIFACT_ID),$(call uniq, $(ALL_DEP
 MODULES                    ?= $(BASEDIR)/modules
 GIT                        ?= git
 
-ifeq ($(DEVEL),1)
+ifeq ($(call fcheck,devel,$(BUILD_FEATURES),ON),ON)
   X_URL_SUFFIX                = _RW
 else
   X_URL_SUFFIX                = _RO

make/paths.mk

@@ -22,7 +22,7 @@
 ifndef PREFIX
   ifeq ($(PLATFORM),Windows)
     PREFIX                     := $(BASEDIR)/INSTALL
-  else ifeq ($(CROSS_COMPILE),1)
+  else ifeq ($(call fcheck,crosscompile,$(BUILD_FEATURES),ON),ON)
     PREFIX                     := $(BASEDIR)/INSTALL
   else
     PREFIX                     := /usr/local
@@ -43,7 +43,7 @@ BINDIR                     := $(PREFIX)/bin
 INCDIR                     := $(PREFIX)/include
 BUILDDIR                   := $(BASEDIR)/.build
 TARGET_BUILDDIR            := $(BUILDDIR)/target
-ifeq ($(CROSS_COMPILE),1)
+ifeq ($(call fcheck,crosscompile,$(BUILD_FEATURES),ON),ON)
   HOST_BUILDDIR              := $(BUILDDIR)/host
 else
   HOST_BUILDDIR              := $(TARGET_BUILDDIR)