Tweak MOD jack2 build, skip qt on linux; Cleanup

Signed-off-by: falkTX <falktx@falktx.com>

bootstrap-jack2.sh

@@ -117,10 +117,23 @@ fi
 # ---------------------------------------------------------------------------------------------------------------------
 # portaudio (win32 only)
 
-if [ "${WIN32}" -eq 1 ]; then
-    export EXTRA_CFLAGS="-I${ASIO_DIR}"
-    export EXTRA_CXXFLAGS="-I${ASIO_DIR}"
-    export EXTRA_MAKE_ARGS="-j 1"
+if [ "${LINUX}" -eq 1 ] || [ "${WIN32}" -eq 1 ]; then
+    PORTAUDIO_EXTRAFLAGS=""
+    PORTAUDIO_EXTRAFLAGS+=" --enable-cxx"
+    PORTAUDIO_EXTRAFLAGS+=" --without-asihpi"
+    PORTAUDIO_EXTRAFLAGS+=" --without-jack"
+    PORTAUDIO_EXTRAFLAGS+=" --without-oss"
+
+    if [ "${LINUX}" -eq 1 ]; then
+        PORTAUDIO_EXTRAFLAGS+=" --with-alsa"
+    elif [ "${WIN32}" -eq 1 ]; then
+        export EXTRA_CFLAGS="-I${ASIO_DIR}"
+        export EXTRA_CXXFLAGS="-I${ASIO_DIR}"
+        export EXTRA_MAKE_ARGS="-j 1"
+        PORTAUDIO_EXTRAFLAGS+=" --with-asiodir=${ASIO_DIR}"
+        PORTAUDIO_EXTRAFLAGS+=" --with-winapi=asio,directx,wasapi,wdmks,wmme"
+    fi
+
     download portaudio19 "${PORTAUDIO_VERSION}" "${PORTAUDIO_URL}" "orig.tar.gz"
     remove_file portaudio19 "${PORTAUDIO_VERSION}" "src/hostapi/wasapi/mingw-include/audioclient.h"
     remove_file portaudio19 "${PORTAUDIO_VERSION}" "src/hostapi/wasapi/mingw-include/devicetopology.h"
@@ -135,8 +148,11 @@ if [ "${WIN32}" -eq 1 ]; then
     remove_file portaudio19 "${PORTAUDIO_VERSION}" "src/hostapi/wasapi/mingw-include/rpcsal.h"
     remove_file portaudio19 "${PORTAUDIO_VERSION}" "src/hostapi/wasapi/mingw-include/sal.h"
     remove_file portaudio19 "${PORTAUDIO_VERSION}" "src/hostapi/wasapi/mingw-include/structuredquery.h"
-    build_autoconf portaudio19 "${PORTAUDIO_VERSION}" "--enable-cxx --with-asiodir=${ASIO_DIR} --with-winapi=asio,directx,wasapi,wdmks,wmme"
-    install_file portaudio19 "${PORTAUDIO_VERSION}" "include/pa_asio.h" "include"
+    build_autoconf portaudio19 "${PORTAUDIO_VERSION}" "${PORTAUDIO_EXTRAFLAGS}"
+
+    if [ "${WIN32}" -eq 1 ]; then
+        install_file portaudio19 "${PORTAUDIO_VERSION}" "include/pa_asio.h" "include"
+    fi
 fi
 
 # ---------------------------------------------------------------------------------------------------------------------

bootstrap-mod.sh

@@ -31,7 +31,43 @@ source setup/versions.sh
 ./bootstrap-jack2.sh "${target}"
 ./bootstrap-plugins.sh "${target}"
 ./bootstrap-python.sh "${target}"
-./bootstrap-qt.sh "${target}"
+
+# Use local Qt on Linux builds
+if [ "${LINUX}" -eq 1 ]; then
+    if [ "${LINUX_TARGET}" = "linux-aarch64" ]; then
+        export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
+    elif [ "${LINUX_TARGET}" = "linux-armhf" ]; then
+        export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig
+    elif [ "${LINUX_TARGET}" = "linux-i686" ]; then
+        export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
+    elif [ "${LINUX_TARGET}" = "linux-riscv64" ]; then
+        export PKG_CONFIG_PATH=/usr/lib/riscv64-linux-gnu/pkgconfig
+    elif [ "${LINUX_TARGET}" = "linux-x86_64" ]; then
+        export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
+    fi
+    if ! pkg-config --exists Qt5Core Qt5Gui Qt5Svg Qt5Widgets; then
+        echo "Qt system libs are not available, cannot continue"
+        exit 2
+    fi
+    if [ ! -e "${TARGET_PKG_CONFIG_PATH}/Qt5Core.pc" ]; then
+        cp $(pkg-config --variable=pcfiledir Qt5Core)/Qt5Core.pc ${TARGET_PKG_CONFIG_PATH}/
+        sed -i '/Libs.private/d' ${TARGET_PKG_CONFIG_PATH}/Qt5Core.pc
+    fi
+    if [ ! -e "${TARGET_PKG_CONFIG_PATH}/Qt5Gui.pc" ]; then
+        cp $(pkg-config --variable=pcfiledir Qt5Gui)/Qt5Gui.pc ${TARGET_PKG_CONFIG_PATH}/
+        sed -i '/Libs.private/d' ${TARGET_PKG_CONFIG_PATH}/Qt5Gui.pc
+    fi
+    if [ ! -e "${TARGET_PKG_CONFIG_PATH}/Qt5Svg.pc" ]; then
+        cp $(pkg-config --variable=pcfiledir Qt5Svg)/Qt5Svg.pc ${TARGET_PKG_CONFIG_PATH}/
+        sed -i '/Libs.private/d' ${TARGET_PKG_CONFIG_PATH}/Qt5Svg.pc
+    fi
+    if [ ! -e "${TARGET_PKG_CONFIG_PATH}/Qt5Widgets.pc" ]; then
+        cp $(pkg-config --variable=pcfiledir Qt5Widgets)/Qt5Widgets.pc ${TARGET_PKG_CONFIG_PATH}/
+        sed -i '/Libs.private/d' ${TARGET_PKG_CONFIG_PATH}/Qt5Widgets.pc
+    fi
+else
+    ./bootstrap-qt.sh "${target}"
+fi
 
 # ---------------------------------------------------------------------------------------------------------------------
 # merged usr mode
@@ -91,10 +127,24 @@ fi
 # jack2
 
 JACK2_EXTRAFLAGS=""
+JACK2_EXTRAFLAGS+=" --autostart=none"
+JACK2_EXTRAFLAGS+=" --classic"
+JACK2_EXTRAFLAGS+=" --db=yes"
+JACK2_EXTRAFLAGS+=" --doxygen=no"
+JACK2_EXTRAFLAGS+=" --firewire=no"
+JACK2_EXTRAFLAGS+=" --iio=no"
+JACK2_EXTRAFLAGS+=" --celt=no"
+JACK2_EXTRAFLAGS+=" --example-tools=no"
+JACK2_EXTRAFLAGS+=" --opus=no"
+JACK2_EXTRAFLAGS+=" --samplerate=no"
+JACK2_EXTRAFLAGS+=" --sndfile=no"
+JACK2_EXTRAFLAGS+=" --readline=no"
+JACK2_EXTRAFLAGS+=" --systemd=no"
+JACK2_EXTRAFLAGS+=" --zalsa=no"
 
 if [ "${CROSS_COMPILING}" -eq 1 ]; then
     if [ "${LINUX}" -eq 1 ]; then
-        JACK2_EXTRAFLAGS+=" --platform=linux"
+        JACK2_EXTRAFLAGS+=" --platform=linux --portaudio=yes --alsa=yes"
     elif [ "${MACOS}" -eq 1 ]; then
         JACK2_EXTRAFLAGS+=" --platform=darwin"
     elif [ "${WIN32}" -eq 1 ]; then

bootstrap-python.sh

@@ -28,6 +28,14 @@ source setup/env.sh
 source setup/functions.sh
 source setup/versions.sh
 
+# ---------------------------------------------------------------------------------------------------------------------
+# check for depedencies
+
+if [ "${LINUX}" -eq 1 ] && ! command -v patchelf >/dev/null; then
+    echo "missing 'patchelf' program, cannot continue!"
+    exit 2
+fi
+
 # ---------------------------------------------------------------------------------------------------------------------
 # wine bootstrap for python (needed for cross-compilation)