Update build scripts, WIP

data/linux/build-deps.sh

@@ -173,7 +173,7 @@ fi
 # flac
 
 if [ ! -d flac-${FLAC_VERSION} ]; then
-  aria2c https://svn.xiph.org/releases/flac/flac-${FLAC_VERSION}.tar.xz
+  aria2c https://ftp.osuosl.org/pub/xiph/releases/flac/flac-${FLAC_VERSION}.tar.xz
   tar -xf flac-${FLAC_VERSION}.tar.xz
 fi
 
@@ -228,18 +228,18 @@ fi
 # fluidsynth
 
 if [ ! -d fluidsynth-${FLUIDSYNTH_VERSION} ]; then
-  aria2c https://download.sourceforge.net/fluidsynth/fluidsynth-${FLUIDSYNTH_VERSION}.tar.gz
+  aria2c https://github.com/FluidSynth/fluidsynth/archive/v${FLUIDSYNTH_VERSION}.tar.gz
   tar -xf fluidsynth-${FLUIDSYNTH_VERSION}.tar.gz
 fi
 
 if [ ! -f fluidsynth-${FLUIDSYNTH_VERSION}/build-done ]; then
   cd fluidsynth-${FLUIDSYNTH_VERSION}
-  ./configure --enable-static --disable-shared --prefix=${PREFIX} \
-    --enable-libsndfile-support \
-    --disable-dbus-support --disable-aufile-support \
-    --disable-pulse-support --disable-alsa-support --disable-portaudio-support --disable-oss-support --disable-jack-support \
-    --disable-coreaudio --disable-coremidi --disable-dart --disable-lash --disable-ladcca \
-    --without-readline
+  cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PREFIX} -DBUILD_SHARED_LIBS=OFF \
+    -Denable-debug=OFF -Denable-profiling=OFF -Denable-ladspa=OFF -Denable-fpe-check=OFF -Denable-portaudio=OFF \
+    -Denable-trap-on-fpe=OFF -Denable-aufile=OFF -Denable-dbus=OFF -Denable-ipv6=OFF -Denable-jack=OFF \
+    -Denable-midishare=OFF -Denable-oss=OFF -Denable-pulseaudio=OFF -Denable-readline=OFF -Denable-ladcca=OFF \
+    -Denable-lash=OFF -Denable-alsa=OFF -Denable-coreaudio=OFF -Denable-coremidi=OFF -Denable-framework=OFF \
+    -Denable-floats=ON
   make ${MAKE_ARGS}
   make install
   sed -i -e "s|-lfluidsynth|-lfluidsynth -lglib-2.0 -lgthread-2.0 -lsndfile -lFLAC -lvorbisenc -lvorbis -logg -lpthread -lm|" ${PREFIX}/lib/pkgconfig/fluidsynth.pc

data/linux/common.env

@@ -3,14 +3,14 @@
 PKG_CONFIG_VERSION=0.28
 LIBLO_VERSION=0.29
 ZLIB_VERSION=1.2.11
-FILE_VERSION=5.32
+FILE_VERSION=5.34
 LIBOGG_VERSION=1.3.3
-LIBVORBIS_VERSION=1.3.5
+LIBVORBIS_VERSION=1.3.6
 FLAC_VERSION=1.3.2
 LIBSNDFILE_VERSION=1.0.28
-FLUIDSYNTH_VERSION=1.1.6
+FLUIDSYNTH_VERSION=1.1.11
 MXML_VERSION=2.11
-FFTW3_VERSION=3.3.7
+FFTW3_VERSION=3.3.8
 
 MAKE_ARGS="-j 8"
 TARGETDIR=$HOME/builds

data/macos/build-deps.sh

@@ -193,7 +193,7 @@ fi
 # flac
 
 if [ ! -d flac-${FLAC_VERSION} ]; then
-  curl -O https://svn.xiph.org/releases/flac/flac-${FLAC_VERSION}.tar.xz
+  curl -O https://ftp.osuosl.org/pub/xiph/releases/flac/flac-${FLAC_VERSION}.tar.xz
   /opt/local/bin/7z x flac-${FLAC_VERSION}.tar.xz
   /opt/local/bin/7z x flac-${FLAC_VERSION}.tar
 fi
@@ -230,36 +230,36 @@ fi
 # ---------------------------------------------------------------------------------------------------------------------
 # libffi
 
-if [ ! -d libffi-${LIBFFI_VERSION} ]; then
-  curl -O ftp://sourceware.org/pub/libffi/libffi-${LIBFFI_VERSION}.tar.gz
-  tar -xf libffi-${LIBFFI_VERSION}.tar.gz
-fi
-
-if [ ! -f libffi-${LIBFFI_VERSION}/build-done ]; then
-  cd libffi-${LIBFFI_VERSION}
-  ./configure --enable-static --disable-shared --prefix=${PREFIX}
-  make ${MAKE_ARGS}
-  make install
-  touch build-done
-  cd ..
-fi
+# if [ ! -d libffi-${LIBFFI_VERSION} ]; then
+#   curl -O ftp://sourceware.org/pub/libffi/libffi-${LIBFFI_VERSION}.tar.gz
+#   tar -xf libffi-${LIBFFI_VERSION}.tar.gz
+# fi
+#
+# if [ ! -f libffi-${LIBFFI_VERSION}/build-done ]; then
+#   cd libffi-${LIBFFI_VERSION}
+#   ./configure --enable-static --disable-shared --prefix=${PREFIX}
+#   make ${MAKE_ARGS}
+#   make install
+#   touch build-done
+#   cd ..
+# fi
 
 # ---------------------------------------------------------------------------------------------------------------------
 # gettext
 
-if [ ! -d gettext-${GETTEXT_VERSION} ]; then
-  curl -O http://ftp.gnu.org/gnu/gettext/gettext-${GETTEXT_VERSION}.tar.gz
-  tar -xf gettext-${GETTEXT_VERSION}.tar.gz
-fi
-
-if [ ! -f gettext-${GETTEXT_VERSION}/build-done ]; then
-  cd gettext-${GETTEXT_VERSION}
-  env PATH=/opt/local/bin:$PATH ./configure --enable-static --disable-shared --prefix=${PREFIX}
-  env PATH=/opt/local/bin:$PATH make ${MAKE_ARGS}
-  make install
-  touch build-done
-  cd ..
-fi
+# if [ ! -d gettext-${GETTEXT_VERSION} ]; then
+#   curl -O http://ftp.gnu.org/gnu/gettext/gettext-${GETTEXT_VERSION}.tar.gz
+#   tar -xf gettext-${GETTEXT_VERSION}.tar.gz
+# fi
+#
+# if [ ! -f gettext-${GETTEXT_VERSION}/build-done ]; then
+#   cd gettext-${GETTEXT_VERSION}
+#   env PATH=/opt/local/bin:$PATH ./configure --enable-static --disable-shared --prefix=${PREFIX}
+#   env PATH=/opt/local/bin:$PATH make ${MAKE_ARGS}
+#   make install
+#   touch build-done
+#   cd ..
+# fi
 
 # ---------------------------------------------------------------------------------------------------------------------
 # glib
@@ -272,9 +272,15 @@ fi
 
 if [ ! -f glib-${GLIB_VERSION}/build-done ]; then
   cd glib-${GLIB_VERSION}
+  if [ ! -f patched ]; then
+    patch -p1 -i ../patches/glib_skip-gettext.patch
+    sed -i "s|po docs|po|" Makefile.in
+    touch patched
+  fi
   chmod +x configure install-sh
+  env PATH=/opt/local/bin:$PATH autoconf
   env PATH=/opt/local/bin:$PATH LDFLAGS="-L${PREFIX}/lib -m${ARCH}" \
-    ./configure --enable-static --disable-shared --prefix=${PREFIX}
+    ./configure --enable-static --disable-shared --disable-docs --prefix=${PREFIX}
   env PATH=/opt/local/bin:$PATH make ${MAKE_ARGS} || true
   touch gio/gio-querymodules gio/glib-compile-resources gio/gsettings gio/gdbus gio/gresource gio/gapplication
   env PATH=/opt/local/bin:$PATH make ${MAKE_ARGS}
@@ -288,19 +294,19 @@ fi
 # fluidsynth
 
 if [ ! -d fluidsynth-${FLUIDSYNTH_VERSION} ]; then
-  curl -L https://download.sourceforge.net/fluidsynth/fluidsynth-${FLUIDSYNTH_VERSION}.tar.gz -o fluidsynth-${FLUIDSYNTH_VERSION}.tar.gz
+  curl -L https://github.com/FluidSynth/fluidsynth/archive/v${FLUIDSYNTH_VERSION}.tar.gz -o fluidsynth-${FLUIDSYNTH_VERSION}.tar.gz
   tar -xf fluidsynth-${FLUIDSYNTH_VERSION}.tar.gz
 fi
 
 if [ ! -f fluidsynth-${FLUIDSYNTH_VERSION}/build-done ]; then
   cd fluidsynth-${FLUIDSYNTH_VERSION}
-  env LDFLAGS="${LDFLAGS} -framework Carbon -framework CoreFoundation" \
-  ./configure --enable-static --disable-shared --prefix=${PREFIX} \
-    --enable-libsndfile-support \
-    --disable-dbus-support --disable-aufile-support \
-    --disable-pulse-support --disable-alsa-support --disable-portaudio-support --disable-oss-support --disable-jack-support \
-    --disable-coreaudio --disable-coremidi --disable-dart --disable-lash --disable-ladcca \
-    --without-readline
+#   env LDFLAGS="${LDFLAGS} -framework Carbon -framework CoreFoundation"
+  cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PREFIX} -DBUILD_SHARED_LIBS=OFF \
+    -Denable-debug=OFF -Denable-profiling=OFF -Denable-ladspa=OFF -Denable-fpe-check=OFF -Denable-portaudio=OFF \
+    -Denable-trap-on-fpe=OFF -Denable-aufile=OFF -Denable-dbus=OFF -Denable-ipv6=OFF -Denable-jack=OFF \
+    -Denable-midishare=OFF -Denable-oss=OFF -Denable-pulseaudio=OFF -Denable-readline=OFF -Denable-ladcca=OFF \
+    -Denable-lash=OFF -Denable-alsa=OFF -Denable-coreaudio=OFF -Denable-coremidi=OFF -Denable-framework=OFF \
+    -Denable-floats=ON
   make ${MAKE_ARGS}
   make install
   sed -i -e "s|-lfluidsynth|-lfluidsynth -lglib-2.0 -lgthread-2.0 -lsndfile -lFLAC -lvorbisenc -lvorbis -logg -lpthread -lm -liconv -lintl|" ${PREFIX}/lib/pkgconfig/fluidsynth.pc

data/macos/common.env

@@ -3,19 +3,18 @@
 PKG_CONFIG_VERSION=0.28
 LIBLO_VERSION=0.29
 ZLIB_VERSION=1.2.11
-FILE_VERSION=5.32
+FILE_VERSION=5.34
 LIBOGG_VERSION=1.3.3
-LIBVORBIS_VERSION=1.3.5
+LIBVORBIS_VERSION=1.3.6
 FLAC_VERSION=1.3.2
 LIBSNDFILE_VERSION=1.0.28
-LIBFFI_VERSION=3.2.1
-GETTEXT_VERSION=0.18.3.2
+# LIBFFI_VERSION=3.2.1
+# GETTEXT_VERSION=0.18.3.2
 GLIB_VERSION=2.44.1
 GLIB_MVERSION=2.44
-FLUIDSYNTH_VERSION=1.1.6
-ZLIB_VERSION=1.2.11
+FLUIDSYNTH_VERSION=1.1.11
 MXML_VERSION=2.11
-FFTW3_VERSION=3.3.7
+FFTW3_VERSION=3.3.8
 QT5_VERSION=5.5.1
 QT5_MVERSION=5.5
 PYTHON_VERSION=3.4.7

data/windows/build-deps.sh

@@ -21,7 +21,7 @@ source common.env
 cleanup_prefix()
 {
 
-rm -rf ${TARGETDIR}/carla-w32nosse ${TARGETDIR}/carla-w32/ ${TARGETDIR}/carla-w64/
+rm -rf ${TARGETDIR}/carla-w32nosse ${TARGETDIR}/carla-w32 ${TARGETDIR}/carla-w64
 
 }
 
@@ -30,11 +30,13 @@ cleanup_pkgs()
 
 rm -rf flac-*
 rm -rf fluidsynth-*
+rm -rf fftw-*
 rm -rf glib-*
 rm -rf liblo-*
 rm -rf libogg-*
 rm -rf libsndfile-*
 rm -rf libvorbis-*
+rm -rf mxml-*
 rm -rf pkg-config-*
 rm -rf zlib-*
 
@@ -204,7 +206,7 @@ fi
 # flac
 
 if [ ! -d flac-${FLAC_VERSION} ]; then
-  wget -c https://svn.xiph.org/releases/flac/flac-${FLAC_VERSION}.tar.xz
+  wget -c https://ftp.osuosl.org/pub/xiph/releases/flac/flac-${FLAC_VERSION}.tar.xz
   tar -xf flac-${FLAC_VERSION}.tar.xz
 fi
 
@@ -269,23 +271,22 @@ fi
 # fluidsynth
 
 if [ ! -d fluidsynth-${FLUIDSYNTH_VERSION} ]; then
-  wget -c https://download.sourceforge.net/fluidsynth/fluidsynth-${FLUIDSYNTH_VERSION}.tar.gz
+  wget -c https://github.com/FluidSynth/fluidsynth/archive/v${FLUIDSYNTH_VERSION}.tar.gz -O fluidsynth-${FLUIDSYNTH_VERSION}.tar.gz
   tar -xf fluidsynth-${FLUIDSYNTH_VERSION}.tar.gz
 fi
 
 if [ ! -f fluidsynth-${FLUIDSYNTH_VERSION}/build-done ]; then
   cd fluidsynth-${FLUIDSYNTH_VERSION}
-  if [ ! -f patched ]; then
-    patch -p1 -i ../patches/fluidsynth_fix-64-bit-cast.patch
-    touch patched
-  fi
-  ./configure --enable-static --disable-shared --prefix=${PREFIX} \
-    --target=${MINGW_PREFIX} --host=${MINGW_PREFIX} --build=${HOST_ARCH} \
-    --enable-libsndfile-support \
-    --disable-dbus-support --disable-aufile-support \
-    --disable-pulse-support --disable-alsa-support --disable-portaudio-support --disable-oss-support --disable-jack-support \
-    --disable-coreaudio --disable-coremidi --disable-dart --disable-lash --disable-ladcca \
-    --without-readline
+  cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PREFIX} -DBUILD_SHARED_LIBS=OFF \
+    -Denable-debug=OFF -Denable-profiling=OFF -Denable-ladspa=OFF -Denable-fpe-check=OFF -Denable-portaudio=OFF \
+    -Denable-trap-on-fpe=OFF -Denable-aufile=OFF -Denable-dbus=OFF -Denable-ipv6=OFF -Denable-jack=OFF \
+    -Denable-midishare=OFF -Denable-oss=OFF -Denable-pulseaudio=OFF -Denable-readline=OFF -Denable-ladcca=OFF \
+    -Denable-lash=OFF -Denable-alsa=OFF -Denable-coreaudio=OFF -Denable-coremidi=OFF -Denable-framework=OFF \
+    -Denable-floats=ON \
+    -DCMAKE_C_COMPILER_WORKS=1 \
+    -DCMAKE_CROSSCOMPILING=1 \
+    -DCMAKE_SYSTEM_NAME="Windows" \
+    -DCMAKE_HOST_SYSTEM_NAME=${HOST_ARCH}
   make ${MAKE_ARGS}
   make install
   sed -i -e "s|-lfluidsynth|-lfluidsynth -lglib-2.0 -lgthread-2.0 -lsndfile -lFLAC -lvorbisenc -lvorbis -logg -lm -ldsound -lwinmm -lole32 -lws2_32|" ${PREFIX}/lib/pkgconfig/fluidsynth.pc
@@ -364,6 +365,7 @@ fi
 # build base libs
 
 cleanup_prefix
+cleanup_pkgs
 
 export ARCH=32
 export ARCH_PREFIX=32nosse

data/windows/common.env

@@ -3,18 +3,18 @@
 PKG_CONFIG_VERSION=0.28
 LIBLO_VERSION=0.29
 ZLIB_VERSION=1.2.11
-FILE_VERSION=5.32
+FILE_VERSION=5.34
 LIBOGG_VERSION=1.3.3
-LIBVORBIS_VERSION=1.3.5
+LIBVORBIS_VERSION=1.3.6
 FLAC_VERSION=1.3.2
 LIBSNDFILE_VERSION=1.0.28
-LIBFFI_VERSION=3.2.1
-GETTEXT_VERSION=0.18.3.2
+# LIBFFI_VERSION=3.2.1
+# GETTEXT_VERSION=0.18.3.2
 GLIB_VERSION=2.22.5
 GLIB_MVERSION=2.22
-FLUIDSYNTH_VERSION=1.1.6
+FLUIDSYNTH_VERSION=1.1.11
 MXML_VERSION=2.11
-FFTW3_VERSION=3.3.7
+FFTW3_VERSION=3.3.8
 QT5_VERSION=5.5.1
 QT5_MVERSION=5.5
 PYTHON_VERSION=3.4.4

data/windows/patches/fluidsynth_fix-64-bit-cast.patch

@@ -1,11 +0,0 @@
---- a/src/fluid_dll.c
-+++ b/src/fluid_dll.c
-@@ -76,7 +76,7 @@ void* fluid_get_hinstance(void)
-   return (void*) fluid_hinstance;
- }
- 
--static long FAR PASCAL fluid_win32_wndproc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-+static LRESULT CALLBACK fluid_win32_wndproc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
- {
-   switch (message) {
-   case WM_CREATE: