From c6140e8707c37574b1cb7a8bd571204a5337b59f Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 14 Jun 2020 12:04:05 +0100 Subject: [PATCH] Added rtaudio and portaudio, and a few changes needed for them Signed-off-by: falkTX --- build-jack.sh | 22 ++++++++++++++++++++++ setup/functions.sh | 27 ++++++++++++++++++++++++--- setup/versions.sh | 2 ++ 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/build-jack.sh b/build-jack.sh index 028f452..8700b9c 100755 --- a/build-jack.sh +++ b/build-jack.sh @@ -96,6 +96,28 @@ build_custom_db db "${DB_VERSION}" "--disable-java --disable-replication --disab download opus "${OPUS_VERSION}" "https://archive.mozilla.org/pub/opus" build_autoconf opus "${OPUS_VERSION}" "--disable-extra-programs --enable-custom-modes --enable-float-approx" +# --------------------------------------------------------------------------------------------------------------------- +# rtaudio (download, win32 only) + +if [ "${WIN32}" -eq 1 ]; then + download rtaudio "${RTAUDIO_VERSION}" "https://github.com/falkTX/rtaudio.git" "" "git" + # fixes for portaudio + link_file rtaudio "${RTAUDIO_VERSION}" "." "include/common" + link_file rtaudio "${RTAUDIO_VERSION}" "." "include/host" + link_file rtaudio "${RTAUDIO_VERSION}" "." "include/pc" +fi + +# --------------------------------------------------------------------------------------------------------------------- +# portaudio (win32 only) + +if [ "${WIN32}" -eq 1 ]; then + ASIO_DIR="${PAWPAW_BUILDDIR}/rtaudio-${RTAUDIO_VERSION}/include" + export EXTRA_CFLAGS="-I${ASIO_DIR}" + export EXTRA_CXXFLAGS="-I${ASIO_DIR}" + download portaudio19 "${PORTAUDIO_VERSION}" "http://deb.debian.org/debian/pool/main/p/portaudio19" "orig.tar.gz" + build_autoconf portaudio19 "${PORTAUDIO_VERSION}" "--enable-cxx --with-asiodir="${ASIO_DIR}" --with-winapi=asio" +fi + # --------------------------------------------------------------------------------------------------------------------- # tre (win32 only) diff --git a/setup/functions.sh b/setup/functions.sh index 55bb581..4ce9057 100644 --- a/setup/functions.sh +++ b/setup/functions.sh @@ -29,6 +29,8 @@ function download() { local dlurl if echo ${dlbaseurl} | grep -q github.com; then dlurl="${dlbaseurl}/v${version}.${dlext}" + elif [ "${dlext}" = "orig.tar.gz" ]; then + dlurl="${dlbaseurl}/${name}_${version}.${dlext}" else dlurl="${dlbaseurl}/${name}-${version}.${dlext}" fi @@ -72,9 +74,9 @@ function _prebuild() { export CXX="${TARGET_CXX}" export LD="${TARGET_LD}" export STRIP="${TARGET_STRIP}" - export CFLAGS="${TARGET_CFLAGS}" - export CXXFLAGS="${TARGET_CXXFLAGS}" - export LDFLAGS="${TARGET_LDFLAGS}" + export CFLAGS="${TARGET_CFLAGS} ${EXTRA_CFLAGS}" + export CXXFLAGS="${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS}" + export LDFLAGS="${TARGET_LDFLAGS} ${EXTRA_LDFLAGS}" export PKG_CONFIG_PATH="${TARGET_PKG_CONFIG_PATH}" unset CPPFLAGS @@ -113,6 +115,10 @@ function _postbuild() { unset LDFLAGS unset PKG_CONFIG_PATH + unset EXTRA_CFLAGS + unset EXTRA_CXXFLAGS + unset EXTRA_LDFLAGS + export PATH="${OLD_PATH}" } @@ -378,6 +384,21 @@ function patch_file() { sed -i -e "${rule}" "${pkgdir}/${file}" } +function link_file() { + local name="${1}" + local version="${2}" + local source="${3}" + local target="${4}" + + local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" + + if [ ! -e "${pkgdir}/${target}" ]; then + pushd "${pkgdir}" + ln -sf "${source}" "${target}" + popd + fi +} + function remove_file() { local name="${1}" local version="${2}" diff --git a/setup/versions.sh b/setup/versions.sh index b63c505..c533a1f 100644 --- a/setup/versions.sh +++ b/setup/versions.sh @@ -16,6 +16,8 @@ FFTW_VERSION=3.3.8 AFTEN_VERSION=0.0.8 DB_VERSION=5.3.28 OPUS_VERSION=1.3.1 +PORTAUDIO_VERSION=19.6.0 +RTAUDIO_VERSION=e03448bd15c1c34e842459939d755f5f89e880ed TRE_VERSION=0.8.0 # GLIB_VERSION=2.44.1