A few more tweaks and lib updates

Signed-off-by: falkTX <falktx@falktx.com>

bootstrap-common.sh

@@ -184,10 +184,12 @@ fi
 LIBSNDFILE_EXTRAFLAGS="--disable-alsa --disable-full-suite --disable-sqlite"
 
 # otherwise tests fail
+export EXTRA_CFLAGS="-fno-associative-math -frounding-math"
+
 if [ "${MACOS}" -eq 1 ]; then
-    export EXTRA_CFLAGS="-fno-finite-math-only"
+    export EXTRA_CFLAGS+=" -fsignaling-math"
 else
-    export EXTRA_CFLAGS="-frounding-math -fsignaling-nans"
+    export EXTRA_CFLAGS+=" -fsignaling-nans"
 fi
 
 download libsndfile "${LIBSNDFILE_VERSION}" "${LIBSNDFILE_URL}" "tar.bz2"
@@ -195,7 +197,7 @@ download libsndfile "${LIBSNDFILE_VERSION}" "${LIBSNDFILE_URL}" "tar.bz2"
 build_autoconf libsndfile "${LIBSNDFILE_VERSION}" "${LIBSNDFILE_EXTRAFLAGS}"
 
 if [ "${CROSS_COMPILING}" -eq 0 ]; then
-    run_make libsndfile "${LIBSNDFILE_VERSION}" "check ${MAKE_ARGS}"
+    run_make libsndfile "${LIBSNDFILE_VERSION}" check
 fi
 
 # ---------------------------------------------------------------------------------------------------------------------
@@ -223,8 +225,12 @@ fi # PAWPAW_SKIP_SAMPLERATE
 # zlib (skipped on macOS)
 
 if [ "${MACOS}" -eq 0 ]; then
-    git_clone zlib "${ZLIB_VERSION}" "https://github.com/madler/zlib.git"
+    git_clone zlib "${ZLIB_VERSION}" "${ZLIB_URL}"
     build_conf zlib "${ZLIB_VERSION}" "--static --prefix=${PAWPAW_PREFIX}"
+
+    if [ "${CROSS_COMPILING}" -eq 0 ]; then
+        run_make zlib "${ZLIB_VERSION}" check
+    fi
 fi
 
 # ---------------------------------------------------------------------------------------------------------------------

bootstrap-plugins.sh

@@ -33,6 +33,7 @@ source setup/versions.sh
 
 FFTW_EXTRAFLAGS="--disable-alloca --disable-fortran --with-our-malloc"
 
+# FIXME macos-universal proper optimizations
 if [ "${MACOS_UNIVERSAL}" -eq 0 ]; then
     FFTW_EXTRAFLAGS+=" --enable-sse2"
 fi
@@ -44,6 +45,10 @@ fi
 download fftw "${FFTW_VERSION}" "${FFTW_URL}"
 build_autoconf fftw "${FFTW_VERSION}" "${FFTW_EXTRAFLAGS}"
 
+if [ "${CROSS_COMPILING}" -eq 0 ]; then
+    run_make fftw "${FFTW_VERSION}" check
+fi
+
 # ---------------------------------------------------------------------------------------------------------------------
 # fftwf
 
@@ -52,6 +57,10 @@ FFTWF_EXTRAFLAGS="${FFTW_EXTRAFLAGS} --enable-single"
 copy_download fftw fftwf "${FFTW_VERSION}"
 build_autoconf fftwf "${FFTW_VERSION}" "${FFTWF_EXTRAFLAGS}"
 
+if [ "${CROSS_COMPILING}" -eq 0 ]; then
+    run_make fftwf "${FFTW_VERSION}" check
+fi
+
 # ---------------------------------------------------------------------------------------------------------------------
 # glib
 
@@ -88,10 +97,11 @@ build_autoconf liblo "${LIBLO_VERSION}" "--enable-threads --disable-examples --d
 # ---------------------------------------------------------------------------------------------------------------------
 # pcre (needed for sord_validate, only relevant if we can run the resulting binaries)
 
-if [ "${CROSS_COMPILING}" -eq 0 ] || [ -n "${EXE_WRAPPER}" ]; then
-    download pcre "${PCRE_VERSION}" "${PCRE_URL}"
-    build_autoconf pcre "${PCRE_VERSION}"
-fi
+# FIXME down at the moment
+# if [ "${CROSS_COMPILING}" -eq 0 ] || [ -n "${EXE_WRAPPER}" ]; then
+#     download pcre "${PCRE_VERSION}" "${PCRE_URL}"
+#     build_autoconf pcre "${PCRE_VERSION}"
+# fi
 
 # ---------------------------------------------------------------------------------------------------------------------
 # lv2
@@ -179,12 +189,14 @@ patch_file fluidsynth "${FLUIDSYNTH_VERSION}" "CMakeLists.txt" 's/_init_lib_suff
 build_cmake fluidsynth "${FLUIDSYNTH_VERSION}" "${FLUIDSYNTH_EXTRAFLAGS}"
 
 if [ ! -e "${PAWPAW_PREFIX}/lib/pkgconfig/fluidsynth.pc-e" ]; then
+    FLUIDSYNTH_EXTRALIBS="-lglib-2.0 -lgthread-2.0 -lsndfile -lFLAC -lvorbisenc -lvorbis -lopus -logg -lpthread -lm"
     if [ "${MACOS}" -eq 1 ]; then
-        sed -i -e 's/-lfluidsynth/-lfluidsynth -lglib-2.0 -lgthread-2.0 -lsndfile -lFLAC -lvorbisenc -lvorbis -lopus -logg -lpthread -liconv -lm/' "${PAWPAW_PREFIX}/lib/pkgconfig/fluidsynth.pc"
+        FLUIDSYNTH_EXTRALIBS+=" -liconv"
     elif [ "${WIN32}" -eq 1 ]; then
-        sed -i -e 's/-L${libdir} -lfluidsynth/-L${libdir}  -lfluidsynth -lglib-2.0 -lgthread-2.0 -lsndfile -lFLAC -lvorbisenc -lvorbis -lopus -logg -lpthread -lm -lole32 -lws2_32/' "${PAWPAW_PREFIX}/lib/pkgconfig/fluidsynth.pc"
-        touch "${PAWPAW_PREFIX}/lib/pkgconfig/fluidsynth.pc-e"
+        FLUIDSYNTH_EXTRALIBS+=" -lole32 -lws2_32"
     fi
+    sed -i -e "s/-L${libdir} -lfluidsynth/-L${libdir}  -lfluidsynth ${FLUIDSYNTH_EXTRALIBS}/" "${PAWPAW_PREFIX}/lib/pkgconfig/fluidsynth.pc"
+    touch "${PAWPAW_PREFIX}/lib/pkgconfig/fluidsynth.pc-e"
 fi
 
 # ---------------------------------------------------------------------------------------------------------------------

setup/functions.sh

@@ -531,7 +531,7 @@ function run_make() {
 
     if [ ! -f "${pkgdir}/.stamp_custom_run" ]; then
         pushd "${pkgdir}"
-        make ${makerule}
+        make ${MAKE_ARGS} ${makerule}
         touch .stamp_custom_run
         popd
     fi

setup/versions.sh

@@ -3,7 +3,7 @@
 # ---------------------------------------------------------------------------------------------------------------------
 # common URLs
 
-DROBILLA_URL=http://download.drobilla.net
+DROBILLA_URL=https://download.drobilla.net/
 XIPH_URL=https://downloads.xiph.org/releases
 
 # ---------------------------------------------------------------------------------------------------------------------
@@ -40,14 +40,14 @@ ZLIB_VERSION=cacf7f1d4e3d44d871b605da3b647f07d718623f # 1.2.11
 # bootstrap plugins
 
 FFTW_URL=http://www.fftw.org
-FFTW_VERSION=3.3.9
+FFTW_VERSION=3.3.10
 
 GLIB_URL=http://download.gnome.org/sources/glib/2.22
 GLIB_MVERSION=2.22
 GLIB_VERSION=2.22.5
 
 LIBLO_URL=http://download.sourceforge.net/liblo
-LIBLO_VERSION=0.30
+LIBLO_VERSION=0.31
 
 PCRE_URL=https://ftp.pcre.org/pub/pcre
 PCRE_VERSION=8.44
@@ -67,14 +67,14 @@ SRATOM_VERSION=0.6.8
 LILV_URL=${DROBILLA_URL}
 LILV_VERSION=0.24.12
 
-LV2LINT_URL=https://gitlab.com/OpenMusicKontrollers/lv2lint/-/archive/0.8.0
-LV2LINT_VERSION=0.8.0
+LV2LINT_URL=https://gitlab.com/OpenMusicKontrollers/lv2lint/-/archive/0.14.0
+LV2LINT_VERSION=0.14.0
 
 KXSTUDIO_LV2_EXTENSIONS_URL=https://github.com/KXStudio/LV2-Extensions.git
-KXSTUDIO_LV2_EXTENSIONS_VERSION=fae65fbc173cd2c4367e85917a6ef97280532d88
+KXSTUDIO_LV2_EXTENSIONS_VERSION=4f6802f9f0ac9f5e2a909e4ab2cfbf71648a1b1d
 
 MOD_SDK_URL=https://github.com/moddevices/mod-sdk.git
-MOD_SDK_VERSION=2fe7c7728faa551b2838baa49c0d1953c64f2151
+MOD_SDK_VERSION=21a80729dde1439dcea03bfafbc42981fb503d8a
 
 FLUIDSYNTH_URL=https://github.com/FluidSynth/fluidsynth.git
 FLUIDSYNTH_VERSION=f65c6ba25fb2c7e37c89fc6a4afc5aa645e208c2 # 1.1.11
@@ -83,7 +83,7 @@ MXML_URL=https://github.com/michaelrsweet/mxml.git
 MXML_VERSION=38b044ed8ca2a611ed9ed3e26c4b46416335194e # 3.2
 
 CARLA_URL=https://github.com/falkTX/Carla.git
-CARLA_VERSION=ca44f4bc538690e76f4e02544f047ad9d559a1b8
+CARLA_VERSION=613e6950581ad0cb3c037fac7f0db89633e099e6
 
 # ---------------------------------------------------------------------------------------------------------------------
 # check if lv2lint is supported