Skip to content

Commit 15b5fea

Browse files
committed
Build jack-example-tools from git by default
Signed-off-by: falkTX <falktx@falktx.com>
1 parent 2e37339 commit 15b5fea

1 file changed

Lines changed: 25 additions & 3 deletions

File tree

build-jack2.sh

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cd $(dirname ${0})
66
PAWPAW_ROOT="${PWD}"
77

88
JACK2_VERSION=${JACK2_VERSION:=git}
9-
JACK_EXAMPLE_TOOLS_VERSION=${JACK_EXAMPLE_TOOLS_VERSION:=4}
9+
JACK_EXAMPLE_TOOLS_VERSION=${JACK_EXAMPLE_TOOLS_VERSION:=git}
1010
JACK_ROUTER_VERSION=${JACK_ROUTER_VERSION:=6c2e532bb05d2ba59ef210bef2fe270d588c2fdf}
1111
QJACKCTL_VERSION=${QJACKCTL_VERSION:=0.9.7}
1212

@@ -125,8 +125,30 @@ fi
125125
# ---------------------------------------------------------------------------------------------------------------------
126126
# jack-example-tools
127127

128-
download jack-example-tools "${JACK_EXAMPLE_TOOLS_VERSION}" "https://github.com/jackaudio/jack-example-tools.git" "" "git"
129-
build_meson jack-example-tools "${JACK_EXAMPLE_TOOLS_VERSION}"
128+
jack_example_tools_repo="https://github.com/jackaudio/jack-example-tools.git"
129+
130+
jack_example_tools_args=""
131+
132+
if [ -n "${jack2_extra_prefix}" ]; then
133+
jack_example_tools_args+=" --prefix=${jack2_extra_prefix}"
134+
jack_example_tools_args+=" --destdir="${jack2_prefix}""
135+
else
136+
jack_example_tools_args+=" --prefix=${jack2_prefix}"
137+
fi
138+
139+
if [ "${JACK_EXAMPLE_TOOLS_VERSION}" = "git" ]; then
140+
if [ ! -d jack-example-tools ]; then
141+
git clone --recursive "${jack_example_tools_repo}"
142+
fi
143+
if [ ! -e "${PAWPAW_BUILDDIR}/jack-example-tools-git" ]; then
144+
ln -sf "$(pwd)/jack-example-tools" "${PAWPAW_BUILDDIR}/jack-example-tools-git"
145+
fi
146+
rm -f "${PAWPAW_BUILDDIR}/jack-example-tools-git/.stamp_built"
147+
else
148+
download jack-example-tools "${JACK_EXAMPLE_TOOLS_VERSION}" "${jack_example_tools_repo}" "" "git"
149+
fi
150+
151+
build_meson jack-example-tools "${JACK_EXAMPLE_TOOLS_VERSION}" "${jack_example_tools_args}"
130152

131153
# ---------------------------------------------------------------------------------------------------------------------
132154
# jack-router (download, win32 only)

0 commit comments

Comments
 (0)