Update qjackctl and make it build for macos-universal

bootstrap-jack2.sh

@@ -5,16 +5,13 @@ set -e
 cd $(dirname ${0})
 PAWPAW_ROOT="${PWD}"
 
-JACK2_VERSION=${JACK2_VERSION:=git}
-QJACKCTL_VERSION=${QJACKCTL_VERSION:=0.6.2}
-
 # ---------------------------------------------------------------------------------------------------------------------
 # check target
 
 target="${1}"
 
 if [ -z "${target}" ]; then
-    echo "usage: ${0} <target> [package-build?]"
+    echo "usage: ${0} <target>"
     exit 1
 fi
 

build-jack2.sh

@@ -6,7 +6,7 @@ cd $(dirname ${0})
 PAWPAW_ROOT="${PWD}"
 
 JACK2_VERSION=${JACK2_VERSION:=git}
-QJACKCTL_VERSION=${QJACKCTL_VERSION:=0.6.3}
+QJACKCTL_VERSION=${QJACKCTL_VERSION:=0.9.0}
 
 # ---------------------------------------------------------------------------------------------------------------------
 
@@ -130,6 +130,10 @@ if [ -f "${PAWPAW_PREFIX}/bin/moc" ]; then
         qjackctl_extra_args="--enable-portaudio"
     fi
 
+    if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
+        export EXTRA_CXXFLAGS="-std=gnu++11"
+    fi
+
     build_autoconf qjackctl "${QJACKCTL_VERSION}" "--enable-jack-version ${qjackctl_extra_args}"
 
     if [ "${WIN32}" -eq 1 ]; then

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

@@ -1,14 +0,0 @@
-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:

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

@@ -1,22 +0,0 @@
-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 = 0.0f;
- 		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

patches/qjackctl/03_fix-portaudio-enable.patch

@@ -1,40 +0,0 @@
-diff --git a/configure b/configure
-index 5af7e64..344ac2d 100755
---- a/configure
-+++ b/configure
-@@ -5670,7 +5670,7 @@ $as_echo "yes" >&6; }
- fi
- fi
- if test "x$ac_portaudio" = "xyes"; then
--   $as_echo "#define CONFIG_PORTAUDIO 1 Define if PORTAUDIO library is available." >>confdefs.h
-+   $as_echo "#define CONFIG_PORTAUDIO 1" >>confdefs.h
- 
-    ac_cflags="$ac_cflags $PORTAUDIO_CFLAGS"
-    ac_libs="$ac_libs $PORTAUDIO_LIBS"
-diff --git a/configure.ac b/configure.ac
-index a7263e3..52eef13 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -402,7 +402,7 @@ if test "x$ac_portaudio" = "xyes"; then
-    PKG_CHECK_MODULES([PORTAUDIO], [portaudio-2.0], [ac_portaudio="yes"], [ac_portaudio="no"])
- fi
- if test "x$ac_portaudio" = "xyes"; then
--   AC_DEFINE(CONFIG_PORTAUDIO 1, [Define if PORTAUDIO library is available.])
-+   AC_DEFINE(CONFIG_PORTAUDIO, 1, [Define if PORTAUDIO library is available.])
-    ac_cflags="$ac_cflags $PORTAUDIO_CFLAGS"
-    ac_libs="$ac_libs $PORTAUDIO_LIBS"
- else
-diff --git a/src/config.h.in b/src/config.h.in
-index 579aa21..a1aedfc 100644
---- a/src/config.h.in
-+++ b/src/config.h.in
-@@ -66,6 +66,9 @@
- /* Default man page path. */
- #undef CONFIG_MANDIR
- 
-+/* Define if PORTAUDIO library is available. */
-+#undef CONFIG_PORTAUDIO
-+
- /* Default installation prefix. */
- #undef CONFIG_PREFIX
- 

patches/qjackctl/04_server-prefix-winmme.patch

@@ -1,13 +0,0 @@
-diff --git a/src/qjackctlSetup.cpp b/src/qjackctlSetup.cpp
-index 2b49ffc..73c6e21 100644
---- a/src/qjackctlSetup.cpp
-+++ b/src/qjackctlSetup.cpp
-@@ -382,7 +382,7 @@ bool qjackctlSetup::loadPreset ( qjackctlPreset& preset, const QString& sPreset
- 
- 	m_settings.beginGroup("/Settings" + sSuffix);
- #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
--	preset.sServerPrefix = m_settings.value("/Server", "jackd -S").toString();
-+	preset.sServerPrefix = m_settings.value("/Server", "jackd -S -X winmme").toString();
- #else
- 	preset.sServerPrefix = m_settings.value("/Server", "jackd").toString();
- #endif

patches/qjackctl/05_fix-win32-jackd-path.patch

@@ -1,14 +0,0 @@
-diff --git a/src/qjackctlMainForm.cpp b/src/qjackctlMainForm.cpp
-index 2e251d6..6dd57af 100644
---- a/src/qjackctlMainForm.cpp
-+++ b/src/qjackctlMainForm.cpp
-@@ -1327,7 +1327,8 @@ void qjackctlMainForm::startJack (void)
- 		const QString sPath = QString::fromUtf8(::getenv("PATH"));
- 		QStringList paths = sPath.split(chPathSep);
- 	#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
--		paths = paths << "C:\\Program Files\\Jack" << "C:\\Program Files (x86)\\Jack";
-+		paths = paths << QString("%1\\JACK2").arg(getenv("PROGRAMFILES"))
-+		              << QString("%1\\JACK2").arg(getenv("PROGRAMFILES(x86)"));
- 	#endif
-         #if defined(__APPLE__)
-                 paths = paths << "/usr/local/bin/";