Tweaks for qjackctl to build, add portaudio asio patch

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

build-jack.sh

@@ -113,6 +113,7 @@ if [ "${WIN32}" -eq 1 ]; then
     ASIO_DIR="${PAWPAW_BUILDDIR}/rtaudio-${RTAUDIO_VERSION}/include"
     export EXTRA_CFLAGS="-I${ASIO_DIR}"
     export EXTRA_CXXFLAGS="-I${ASIO_DIR}"
+    export EXTRA_MAKE_ARGS="-j 1"
     download portaudio19 "${PORTAUDIO_VERSION}" "http://deb.debian.org/debian/pool/main/p/portaudio19" "orig.tar.gz"
     build_autoconf portaudio19 "${PORTAUDIO_VERSION}" "--enable-cxx --with-asiodir="${ASIO_DIR}" --with-winapi=asio"
 fi
@@ -160,6 +161,8 @@ fi
 if [ "${JACK2_VERSION}" = "git" ]; then
     if [ ! -d jack2 ]; then
         git clone --recursive "${jack2_repo}"
+    fi
+    if [ ! -e "${PAWPAW_BUILDDIR}/jack2-git" ]; then
         ln -sf "$(pwd)/jack2" "${PAWPAW_BUILDDIR}/jack2-git"
     fi
     rm -f "${PAWPAW_BUILDDIR}/jack2-git/.stamp_built"
@@ -169,14 +172,15 @@ fi
 
 build_waf jack2 "${JACK2_VERSION}" "${jack2_args}"
 
-# patch pkg-config file for static builds, and create link in regular prefix
+# patch pkg-config file for static builds in regular prefix
 if [ ! -e "${PAWPAW_PREFIX}/lib/pkgconfig/jack.pc" ]; then
-    local s=""
     if [ "${WIN64}" -eq 1 ]; then
         s="64"
+    else
+        s=""
     fi
-    sed -i -e "${PAWPAW_PREFIX}/jack2/lib/pkgconfig/jack.pc" "s/lib -ljack${s}/lib -Wl,-Bdynamic -ljack${s} -Wl,-Bstatic /"
-    ln -sv "${PAWPAW_PREFIX}/jack2/lib/pkgconfig/jack.pc" "${PAWPAW_PREFIX}/lib/pkgconfig/jack.pc"
+    cp -v "${PAWPAW_PREFIX}/jack2/lib/pkgconfig/jack.pc" "${PAWPAW_PREFIX}/lib/pkgconfig/jack.pc"
+    sed -i -e "s/lib -ljack${s}/lib -Wl,-Bdynamic -ljack${s} -Wl,-Bstatic/" "${PAWPAW_PREFIX}/lib/pkgconfig/jack.pc"
 fi
 
 # ---------------------------------------------------------------------------------------------------------------------
@@ -186,6 +190,9 @@ if [ -f "${PAWPAW_PREFIX}/bin/moc" ]; then
     download qjackctl "${QJACKCTL_VERSION}" https://download.sourceforge.net/qjackctl
     patch_file qjackctl "${QJACKCTL_VERSION}" "configure" 's/-ljack /-Wl,-Bdynamic -ljack64 -Wl,-Bstatic /'
     build_autoconf qjackctl "${QJACKCTL_VERSION}" "--enable-jack-version"
+    if [ "${WIN32}" -eq 1 ]; then
+        copy_file qjackctl "${QJACKCTL_VERSION}" "src/release/qjackctl.exe" "${PAWPAW_PREFIX}/jack2/bin/qjackctl.exe"
+    fi
 fi
 
 # ---------------------------------------------------------------------------------------------------------------------

build-qt.sh

@@ -69,9 +69,6 @@ function build_qt_conf() {
     unset CXXFLAGS
     unset LDFLAGS
 
-    export CFLAGS="${TARGET_CFLAGS}"
-    export CXXFLAGS="${TARGET_CXXFLAGS} -Wno-deprecated-copy -Wno-deprecated-declarations"
-    export LDFLAGS="${TARGET_LDFLAGS}"
     export PKG_CONFIG="${TARGET_PKG_CONFIG}"
     export PKG_CONFIG_LIBDIR="${TARGET_PKG_CONFIG_PATH}"
     export PKG_CONFIG_PATH="${TARGET_PKG_CONFIG_PATH}"
@@ -107,14 +104,6 @@ function build_qt_conf() {
         popd
     fi
 
-    unset AR
-    unset CC
-    unset CXX
-    unset LD
-    unset STRIP
-    unset CFLAGS
-    unset CXXFLAGS
-    unset LDFLAGS
     unset PKG_CONFIG
     unset PKG_CONFIG_LIBDIR
     unset PKG_CONFIG_PATH

patches/portaudio19/01_build-asio-device-adapter.patch

@@ -0,0 +1,11 @@
+diff --git a/bindings/cpp/source/portaudiocpp/Device.cxx b/bindings/cpp/source/portaudiocpp/Device.cxx
+index 7b21b03..04e75b1 100644
+--- a/bindings/cpp/source/portaudiocpp/Device.cxx
++++ b/bindings/cpp/source/portaudiocpp/Device.cxx
+@@ -166,3 +166,6 @@ namespace portaudio
+ } // namespace portaudio
+ 
+ 
++#ifdef _WIN32
++#include "AsioDeviceAdapter.cxx"
++#endif

patches/qjackctl/01_fix-win32-build.patch

@@ -0,0 +1,14 @@
+diff --git a/src/qjackctlMainForm.cpp b/src/qjackctlMainForm.cpp
+index ddc448b..3f4814d 100644
+--- a/src/qjackctlMainForm.cpp
++++ b/src/qjackctlMainForm.cpp
+@@ -2645,9 +2645,6 @@ void qjackctlMainForm::exitNotifyEvent (void)
+ 		jackFinished();
+ 		break;
+ 	case QProcess::Crashed:
+-	#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
+-		if (!m_bJackStopped)
+-	#endif
+ 		appendMessagesColor(tr("JACK has crashed."), "#cc3366");
+ 		break;
+ 	case QProcess::Timedout:

setup/env.sh

@@ -78,7 +78,7 @@ if [ "${MACOS}" -eq 1 ]; then
 else
     LINK_FLAGS="${LINK_FLAGS} -Wl,-O1 -Wl,--as-needed -Wl,--gc-sections -Wl,--no-undefined -Wl,--strip-all"
     if [ "${WIN32}" -eq 1 ]; then
-        LINK_FLAGS="${LINK_FLAGS} -static -static-libgcc -static-libstdc++"
+        LINK_FLAGS="${LINK_FLAGS} -static -lssp_nonshared -Wl,-Bstatic"
     fi
 fi
 

setup/functions.sh

@@ -118,6 +118,7 @@ function _postbuild() {
     unset EXTRA_CFLAGS
     unset EXTRA_CXXFLAGS
     unset EXTRA_LDFLAGS
+    unset EXTRA_MAKE_ARGS
 
     export PATH="${OLD_PATH}"
 }
@@ -146,7 +147,7 @@ function build_autoconf() {
 
     if [ ! -f "${pkgdir}/.stamp_built" ]; then
         pushd "${pkgdir}"
-        make ${MAKE_ARGS}
+        make ${MAKE_ARGS} ${EXTRA_MAKE_ARGS}
         touch .stamp_built
         popd
     fi
@@ -179,7 +180,7 @@ function build_conf() {
 
     if [ ! -f "${pkgdir}/.stamp_built" ]; then
         pushd "${pkgdir}"
-        make ${MAKE_ARGS}
+        make ${MAKE_ARGS} ${EXTRA_MAKE_ARGS}
         touch .stamp_built
         popd
     fi
@@ -217,7 +218,7 @@ function build_cmake() {
 
     if [ ! -f "${pkgdir}/.stamp_built" ]; then
         pushd "${pkgdir}/build"
-        make ${MAKE_ARGS}
+        make ${MAKE_ARGS} ${EXTRA_MAKE_ARGS}
         touch ../.stamp_built
         popd
     fi
@@ -315,7 +316,7 @@ function build_qmake() {
 
     if [ ! -f "${pkgdir}/.stamp_built" ]; then
         pushd "${pkgdir}"
-        make ${MAKE_ARGS}
+        make ${MAKE_ARGS} ${EXTRA_MAKE_ARGS}
         touch .stamp_built
         popd
     fi
@@ -422,6 +423,21 @@ function patch_file() {
     sed -i -e "${rule}" "${pkgdir}/${file}"
 }
 
+function copy_file() {
+    local name="${1}"
+    local version="${2}"
+    local source="${3}"
+    local target="${4}"
+
+    local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}"
+
+    if [ ! -e "${pkgdir}/${target}" ]; then
+        pushd "${pkgdir}"
+        cp "${source}" "${target}"
+        popd
+    fi
+}
+
 function link_file() {
     local name="${1}"
     local version="${2}"