Browse Source

Make sure portaudio is enabled on windows, use -X winmme by default

Signed-off-by: falkTX <falktx@falktx.com>
tags/v1.0
falkTX 4 years ago
parent
commit
0590ad353e
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 58 additions and 1 deletions
  1. +5
    -1
      build-jack2.sh
  2. +40
    -0
      patches/qjackctl/03_fix-portaudio-enable.patch
  3. +13
    -0
      patches/qjackctl/04_server-prefix-winmme.patch

+ 5
- 1
build-jack2.sh View File

@@ -101,8 +101,12 @@ if [ -f "${PAWPAW_PREFIX}/bin/moc" ]; then
patch_file qjackctl "${QJACKCTL_VERSION}" "configure" 's/-ljack /-Wl,-Bdynamic -ljack64 -Wl,-Bstatic /'
elif [ "${WIN32}" -eq 1 ]; then
patch_file qjackctl "${QJACKCTL_VERSION}" "configure" 's/-ljack /-Wl,-Bdynamic -ljack -Wl,-Bstatic /'
elif [ "${MACOS}" -eq 1 ]; then
fi

if [ "${MACOS}" -eq 1 ]; then
qjackctl_extra_args="--with-jack="${jack2_prefix}${jack2_extra_prefix}""
elif [ "${WIN32}" -eq 1 ]; then
qjackctl_extra_args="--enable-portaudio"
fi

build_autoconf qjackctl "${QJACKCTL_VERSION}" "--enable-jack-version ${qjackctl_extra_args}"


+ 40
- 0
patches/qjackctl/03_fix-portaudio-enable.patch View File

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

+ 13
- 0
patches/qjackctl/04_server-prefix-winmme.patch View File

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

Loading…
Cancel
Save