diff --git a/build-jack2.sh b/build-jack2.sh index d067a1c..b2c2d5e 100755 --- a/build-jack2.sh +++ b/build-jack2.sh @@ -6,14 +6,14 @@ cd $(dirname ${0}) PAWPAW_ROOT="${PWD}" JACK2_VERSION=${JACK2_VERSION:=git} -QJACKCTL_VERSION=${QJACKCTL_VERSION:=0.6.2} +QJACKCTL_VERSION=${QJACKCTL_VERSION:=0.6.3} # --------------------------------------------------------------------------------------------------------------------- target="${1}" if [ -z "${target}" ]; then - echo "usage: ${0} [package-build?]" + echo "usage: ${0} " exit 1 fi diff --git a/patches/qjackctl/05_fix-win32-jackd-path.patch b/patches/qjackctl/05_fix-win32-jackd-path.patch new file mode 100644 index 0000000..a62bf9c --- /dev/null +++ b/patches/qjackctl/05_fix-win32-jackd-path.patch @@ -0,0 +1,14 @@ +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/";