diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index ab81d63..f694975 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -8,7 +8,7 @@ on: branches: - '*' env: - CACHE_VERSION: 6 + CACHE_VERSION: 7 DEBIAN_FRONTEND: noninteractive HOMEBREW_NO_AUTO_UPDATE: 1 PAWPAW_SKIP_LTO: 1 diff --git a/bootstrap-cardinal.sh b/bootstrap-cardinal.sh index 73809a0..ab1ccff 100755 --- a/bootstrap-cardinal.sh +++ b/bootstrap-cardinal.sh @@ -18,9 +18,12 @@ fi # --------------------------------------------------------------------------------------------------------------------- # run bootstrap dependencies +export PAWPAW_SKIP_FFTW=1 +export PAWPAW_SKIP_GLIB=1 export PAWPAW_SKIP_SAMPLERATE=1 ./bootstrap-common.sh "${target}" +./bootstrap-plugins.sh "${target}" # on Windows, we just build the whole thing if [ "${target}" = "win32" ] || [ "${target}" = "win64" ]; then @@ -47,35 +50,3 @@ if [ "${WIN32}" -eq 0 ]; then fi # --------------------------------------------------------------------------------------------------------------------- -# liblo - -LIBLO_EXTRAFLAGS="--enable-threads --disable-examples --disable-tools" - -if [ "${CROSS_COMPILING}" -eq 1 ]; then - LIBLO_EXTRAFLAGS+=" --disable-tests" -fi - -# auto-detection fails -if [ "${MACOS}" -eq 1 ]; then - LIBLO_EXTRAFLAGS+=" ac_cv_func_select=yes ac_cv_func_poll=yes ac_cv_func_setvbuf=yes" - if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then - LIBLO_EXTRAFLAGS+=" ac_cv_c_bigendian=universal" - fi -fi - -download liblo "${LIBLO_VERSION}" "${LIBLO_URL}" -build_autoconf liblo "${LIBLO_VERSION}" "${LIBLO_EXTRAFLAGS}" - -# FIXME tests fail on macOS -if [ "${CROSS_COMPILING}" -eq 0 ] && [ "${MACOS}" -eq 0 ]; then - run_make liblo "${LIBLO_VERSION}" check -fi - -# --------------------------------------------------------------------------------------------------------------------- -# wine bootstrap for python (needed for cross-compilation) - -if [ "${WIN32}" -eq 1 ] && [ -n "${EXE_WRAPPER}" ] && [ ! -d "${WINEPREFIX}" ]; then - wineboot -u -fi - -# --------------------------------------------------------------------------------------------------------------------- diff --git a/bootstrap-plugins.sh b/bootstrap-plugins.sh index 5e537d1..8f7585e 100755 --- a/bootstrap-plugins.sh +++ b/bootstrap-plugins.sh @@ -15,6 +15,13 @@ if [ -z "${target}" ]; then exit 1 fi +# --------------------------------------------------------------------------------------------------------------------- +# skip fluidsynth if glib is not wanted (fluidsynth requires glib) + +if [ -n "${PAWPAW_SKIP_GLIB}" ]; then + PAWPAW_SKIP_FLUIDSYNTH=1 +fi + # --------------------------------------------------------------------------------------------------------------------- # run bootstrap dependencies @@ -31,6 +38,8 @@ source setup/versions.sh # --------------------------------------------------------------------------------------------------------------------- # fftw +if [ -z "${PAWPAW_SKIP_FFTW}" ]; then + FFTW_EXTRAFLAGS="--disable-alloca --disable-fortran --with-our-malloc" # FIXME macos-universal proper optimizations @@ -49,9 +58,13 @@ if [ "${CROSS_COMPILING}" -eq 0 ]; then run_make fftw "${FFTW_VERSION}" check fi +fi # PAWPAW_SKIP_FFTW + # --------------------------------------------------------------------------------------------------------------------- # fftwf +if [ -z "${PAWPAW_SKIP_FFTW}" ]; then + FFTWF_EXTRAFLAGS="${FFTW_EXTRAFLAGS} --enable-single" copy_download fftw fftwf "${FFTW_VERSION}" @@ -61,6 +74,8 @@ if [ "${CROSS_COMPILING}" -eq 0 ]; then run_make fftwf "${FFTW_VERSION}" check fi +fi # PAWPAW_SKIP_FFTW + # --------------------------------------------------------------------------------------------------------------------- # pcre @@ -72,6 +87,8 @@ fi # --------------------------------------------------------------------------------------------------------------------- # libffi +if [ -z "${PAWPAW_SKIP_GLIB}" ]; then + if [ "${WIN32}" -eq 1 ]; then LIBFFI_EXTRAFLAGS="--disable-multi-os-directory --disable-raw-api" @@ -79,9 +96,13 @@ if [ "${WIN32}" -eq 1 ]; then build_autoconf libffi "${LIBFFI_VERSION}" "${LIBFFI_EXTRAFLAGS}" fi +fi # PAWPAW_SKIP_GLIB + # --------------------------------------------------------------------------------------------------------------------- # glib +if [ -z "${PAWPAW_SKIP_GLIB}" ]; then + if [ "${MACOS}" -eq 1 ] || [ "${WIN32}" -eq 1 ]; then GLIB_EXTRAFLAGS="--disable-rebuilds" @@ -108,6 +129,8 @@ if [ "${MACOS}" -eq 1 ] || [ "${WIN32}" -eq 1 ]; then build_autoconfgen glib ${GLIB_VERSION} "${GLIB_EXTRAFLAGS}" fi +fi # PAWPAW_SKIP_GLIB + # --------------------------------------------------------------------------------------------------------------------- # liblo @@ -192,6 +215,8 @@ build_make mod-sdk "${MOD_SDK_VERSION}" # --------------------------------------------------------------------------------------------------------------------- # fluidsynth +if [ -z "${PAWPAW_SKIP_FLUIDSYNTH}" ]; then + FLUIDSYNTH_EXTRAFLAGS="-Denable-floats=ON" FLUIDSYNTH_EXTRAFLAGS+=" -Denable-alsa=OFF" FLUIDSYNTH_EXTRAFLAGS+=" -Denable-aufile=OFF" @@ -229,6 +254,8 @@ if [ ! -e "${PAWPAW_PREFIX}/lib/pkgconfig/fluidsynth.pc-e" ]; then touch "${PAWPAW_PREFIX}/lib/pkgconfig/fluidsynth.pc-e" fi +fi # PAWPAW_SKIP_FLUIDSYNTH + # --------------------------------------------------------------------------------------------------------------------- # mxml