Ensure we use our custom portaudio for linux builds

Signed-off-by: falkTX <[email protected]>
mod-audio · Nov 11, 2023 · 1a55c1f · 1a55c1f
1 parent c163c6d
commit 1a55c1f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,6 +29,7 @@ jobs:
         run: |
           sudo apt-get update -qq
           sudo apt-get install -yqq --allow-downgrades gperf libasound2-dev libdbus-1-dev libgl1-mesa-dev libglib2.0-dev libpcre3-dev libqt5svg5-dev libxcb1-dev libxcursor-dev libxext-dev libxfixes-dev libxrandr-dev libxrender-dev meson qtbase5-dev qtbase5-dev-tools uuid-dev xdg-user-dirs
+          sudo apt-get purge -y portaudio19-dev
       - name: Build dependencies
         run: |
           ./PawPaw/bootstrap-mod.sh linux-x86_64 && ./PawPaw/.cleanup.sh linux-x86_64

diff --git a/mod-plugin-builder b/mod-plugin-builder
diff --git a/systray/Makefile b/systray/Makefile
@@ -2,6 +2,7 @@
 
 CC ?= gcc
 CXX ?= g++
+PKG_CONFIG ?= pkg-config
 
 CXXFLAGS += -fPIC -std=gnu++14 -I. -DVERSION='"$(shell cat ../VERSION)"'
 
@@ -47,20 +48,20 @@ endif
 ifeq ($(MACOS),true)
 LDFLAGS  += -framework CoreAudio
 else
-CXXFLAGS += $(shell pkg-config --cflags portaudio-2.0)
-LDFLAGS  += $(shell pkg-config --libs portaudio-2.0)
+CXXFLAGS += $(shell $(PKG_CONFIG) --cflags portaudio-2.0)
+LDFLAGS  += $(shell $(PKG_CONFIG) --libs portaudio-2.0)
 endif
 
 ifneq ($(MACOS)$(WINDOWS),true)
 LDFLAGS += -ldl
 endif
 
-ifeq ($(shell pkg-config --exists Qt5Core Qt5Gui Qt5Svg Qt5Widgets && echo true)$(WINDOWS),truefalse)
-QT5_HOSTBINS = $(shell pkg-config --variable=host_bins Qt5Core)
-QT5_FLAGS    = $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Svg Qt5Widgets)
-QT5_LIBS     = $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Svg Qt5Widgets)
+ifeq ($(shell $(PKG_CONFIG) --exists Qt5Core Qt5Gui Qt5Svg Qt5Widgets && echo true)$(WINDOWS),truefalse)
+QT5_HOSTBINS = $(shell $(PKG_CONFIG) --variable=host_bins Qt5Core)
+QT5_FLAGS    = $(shell $(PKG_CONFIG) --cflags Qt5Core Qt5Gui Qt5Svg Qt5Widgets)
+QT5_LIBS     = $(shell $(PKG_CONFIG) --libs Qt5Core Qt5Gui Qt5Svg Qt5Widgets)
 else
-QT5_PREFIX   = $(shell pkg-config --variable=prefix Qt5OpenGLExtensions)
+QT5_PREFIX   = $(shell $(PKG_CONFIG) --variable=prefix Qt5OpenGLExtensions)
 QT5_HOSTBINS = $(QT5_PREFIX)/bin
 QT5_FLAGS    = -DQT_CORE_LIB -DQT_GUI_LIB -DQT_SVG_LIB -DQT_WIDGETS_LIB -I$(QT5_PREFIX)/include/qt5
 ifeq ($(MACOS),true)