Browse Source

Update qjackctl to 0.6.3, add patch to fix win32 default path

Signed-off-by: falkTX <falktx@falktx.com>
tags/v1.0
falkTX 2 years ago
parent
commit
038ced3c0e
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 16 additions and 2 deletions
  1. +2
    -2
      build-jack2.sh
  2. +14
    -0
      patches/qjackctl/05_fix-win32-jackd-path.patch

+ 2
- 2
build-jack2.sh View File

@@ -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} <target> [package-build?]"
echo "usage: ${0} <target>"
exit 1
fi



+ 14
- 0
patches/qjackctl/05_fix-win32-jackd-path.patch View File

@@ -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/";

Loading…
Cancel
Save