From 45d3db285c8d891bb8b12f190aa9d8d748cc682b Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 5 Jan 2021 01:01:06 +0000 Subject: [PATCH] Typos and leftover needed for jack2 --- build-jack2.sh | 3 +++ pack-jack2.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build-jack2.sh b/build-jack2.sh index 808c698..f595199 100755 --- a/build-jack2.sh +++ b/build-jack2.sh @@ -142,6 +142,9 @@ if [ -f "${PAWPAW_PREFIX}/bin/moc" ]; then export EXTRA_CXXFLAGS="-std=gnu++11" fi + # TODO remove once 0.9.1 is out + cp "${PAWPAW_ROOT}/patches/qjackctl/clear1.png" "${PAWPAW_BUILDDIR}/qjackctl${name}-${QJACKCTL_VERSION}/src/images/clear1.png" + build_autoconf qjackctl "${QJACKCTL_VERSION}" "--enable-jack-version ${qjackctl_extra_args}" if [ "${WIN32}" -eq 1 ]; then diff --git a/pack-jack2.sh b/pack-jack2.sh index db9dda9..568aa61 100755 --- a/pack-jack2.sh +++ b/pack-jack2.sh @@ -74,7 +74,7 @@ if [ "${WIN32}" -eq 1 ]; then copy_file jack-router "${JACK_ROUTER_VERSION}" "binaries/win32/JackRouter.dll" "${jack2_prefix}/jack-router/win32/JackRouter.dll" copy_file jack-router "${JACK_ROUTER_VERSION}" "binaries/win32/JackRouter.ini" "${jack2_prefix}/jack-router/win32/JackRouter.ini" if [ "${WIN64}" -eq 1 ]; then - copy_file jack-router "${JACK_ROUTER_VERSION}" "binaries/win64/JackRouter.dll" "${jack2_prefix}/jack-router/win32/JackRouter.dll" + copy_file jack-router "${JACK_ROUTER_VERSION}" "binaries/win64/JackRouter.dll" "${jack2_prefix}/jack-router/win64/JackRouter.dll" copy_file jack-router "${JACK_ROUTER_VERSION}" "binaries/win64/JackRouter.ini" "${jack2_prefix}/jack-router/win64/JackRouter.ini" fi