jack2 fixes

build-jack.sh

@@ -240,6 +240,10 @@ if [ -n "${PACKAGING_BUILD}" ]; then
             patch_osx_binary_libs "${f}"
         done
 
+        if [ ! -e jack2 ]; then
+            ln -s "${PAWPAW_BUILDDIR}/jack2-${JACK2_VERSION}" jack2
+        fi
+
         ./jack2/macosx/generate-pkg.sh "${jack2_prefix}${jack2_extra_prefix}/"
 
         qjackctl_app="${PAWPAW_PREFIX}/bin/qjackctl.app"

patches/portaudio19/03_fix-win32-build.patch

@@ -0,0 +1,13 @@
+diff --git a/src/hostapi/asio/iasiothiscallresolver.h b/src/hostapi/asio/iasiothiscallresolver.h
+index 21d53b3..c6aaf32 100644
+--- a/src/hostapi/asio/iasiothiscallresolver.h
++++ b/src/hostapi/asio/iasiothiscallresolver.h
+@@ -130,7 +130,7 @@
+ #endif
+ 
+ #include <windows.h>
+-#include <asiodrvr.h> /* From ASIO SDK */
++#include <iasiodrv.h> /* From ASIO SDK */
+ 
+ 
+ class IASIOThiscallResolver : public IASIO {

patches/qjackctl/02_fix-less-features-build.patch

@@ -0,0 +1,22 @@
+diff --git a/src/qjackctlMainForm.cpp b/src/qjackctlMainForm.cpp
+index 3f4814d..265b012 100644
+--- a/src/qjackctlMainForm.cpp
++++ b/src/qjackctlMainForm.cpp
+@@ -1836,7 +1836,7 @@ QString& qjackctlMainForm::detectXrun ( QString& s )
+ 		s.insert(iPos + rx.matchedLength(), "</font>");
+ 		s.insert(iPos, "<font color=\"#cc0000\">");
+ 	#ifndef CONFIG_JACK_XRUN_DELAY
+-		m_tXrunLast.restart();
++		m_fXrunLast.restart();
+ 		updateXrunStats(rx.cap(1).toFloat());
+ 		refreshXrunStats();
+ 	#endif
+@@ -3664,7 +3664,7 @@ void qjackctlMainForm::refreshStatus (void)
+ 			m_ui.PauseToolButton->setEnabled(false);
+ 			m_ui.ForwardToolButton->setEnabled(false);
+ 			transportPlayStatus(false);
+-			updateStatusItem(STATUS_TRANSPORT_TIME, m_sTimeDashes);
++			updateStatusItem(STATUS_TRANSPORT_TIME, c_szTimeDashes);
+ 			updateStatusItem(STATUS_TRANSPORT_BBT, b);
+ 			updateStatusItem(STATUS_TRANSPORT_BPM, n);
+ 		#endif // !CONFIG_JACK_TRANSPORT