diff --git a/data/macos/build-deps.sh b/data/macos/build-deps.sh
index e1fcdcd0a..09d163e3c 100755
--- a/data/macos/build-deps.sh
+++ b/data/macos/build-deps.sh
@@ -16,25 +16,43 @@ if [ -f Makefile ]; then
   cd data/macos
 fi
 
+# ------------------------------------------------------------------------------------
+# set target dir
+
+TARGETDIR=$HOME/builds
+
 # ------------------------------------------------------------------------------------
 # function to remove old stuff
 
 cleanup()
 {
 
-sudo rm -rf /opt/carla32/ /opt/carla64/
-sudo rm -rf cx_Freeze-*
-sudo rm -rf Python-*
+rm -rf $TARGETDIR/carla/ $TARGETDIR/carla32/ $TARGETDIR/carla64/
+rm -rf cx_Freeze-*
+rm -rf Python-*
+rm -rf PyQt-*
+rm -rf file-*
+rm -rf flac-*
+rm -rf fltk-*
+rm -rf fluidsynth-*
 rm -rf fftw-*
+rm -rf gettext-*
+rm -rf glib-*
+rm -rf libffi-*
+rm -rf libgig-*
 rm -rf liblo-*
+rm -rf libogg-*
+rm -rf libsndfile-*
+rm -rf libvorbis-*
+rm -rf linuxsampler-*
 rm -rf mxml-*
 rm -rf pkg-config-*
-rm -rf PyQt-*
 rm -rf qtbase-*
 rm -rf qtmacextras-*
 rm -rf qtsvg-*
 rm -rf sip-*
 rm -rf zlib-*
+rm -rf PaxHeaders.20420
 
 }
 
@@ -44,17 +62,17 @@ rm -rf zlib-*
 build_base()
 {
 
-export CC=gcc
-export CXX=g++
-
-export CFLAGS="-O2 -mtune=generic -msse -msse2 -m$ARCH -fPIC -DPIC"
-export CXXFLAGS=$CFLAGS
-export LDFLAGS="-m$ARCH"
+export CC=clang
+export CXX=clang++
 
-export PREFIX=/opt/carla$ARCH
+export PREFIX=$TARGETDIR/carla$ARCH
 export PATH=$PREFIX/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
 export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
 
+export CFLAGS="-O3 -mtune=generic -msse -msse2 -m$ARCH -fPIC -DPIC -I$PREFIX/include"
+export CXXFLAGS=$CFLAGS
+export LDFLAGS="-m$ARCH -L$PREFIX/lib"
+
 # ------------------------------------------------------------------------------------
 # pkgconfig
 
@@ -68,7 +86,7 @@ cp -r pkg-config-0.28 pkg-config-0.28_$ARCH
 cd pkg-config-0.28_$ARCH
 ./configure --enable-indirect-deps --with-internal-glib --with-pc-path=$PKG_CONFIG_PATH --prefix=$PREFIX
 make
-sudo make install
+make install
 touch build-done
 cd ..
 fi
@@ -86,7 +104,7 @@ cp -r liblo-0.28 liblo-0.28_$ARCH
 cd liblo-0.28_$ARCH
 ./configure --enable-static --disable-shared --prefix=$PREFIX
 make
-sudo make install
+make install
 touch build-done
 cd ..
 fi
@@ -100,16 +118,16 @@ fi
 # ------------------------------------------------------------------------------------
 # file/magic
 
-if [ ! -d file-5.22 ]; then
-curl -O ftp://ftp.astron.com/pub/file/file-5.22.tar.gz
-tar -xf file-5.22.tar.gz
+if [ ! -d file-5.25 ]; then
+curl -O ftp://ftp.astron.com/pub/file/file-5.25.tar.gz
+tar -xf file-5.25.tar.gz
 fi
 
-if [ ! -f file-5.22/build-done ]; then
-cd file-5.22
+if [ ! -f file-5.25/build-done ]; then
+cd file-5.25
 ./configure --enable-static --disable-shared --prefix=$PREFIX
 make
-sudo make install
+make install
 touch build-done
 cd ..
 fi
@@ -126,7 +144,7 @@ if [ ! -f zlib-1.2.8/build-done ]; then
 cd zlib-1.2.8
 ./configure --static --prefix=$PREFIX
 make
-sudo make install
+make install
 touch build-done
 cd ..
 fi
@@ -141,11 +159,11 @@ fi
 
 if [ ! -f mxml-2.9/build-done ]; then
 cd mxml-2.9
-./configure --enable-static --disable-shared --prefix=$PREFIX
-make
-sudo cp *.a    $PREFIX/lib/
-sudo cp *.pc   $PREFIX/lib/pkgconfig/
-sudo cp mxml.h $PREFIX/include/
+./configure --disable-shared --prefix=$PREFIX
+make libmxml.a
+cp *.a    $PREFIX/lib/
+cp *.pc   $PREFIX/lib/pkgconfig/
+cp mxml.h $PREFIX/include/
 touch build-done
 cd ..
 fi
@@ -162,7 +180,7 @@ if [ ! -f libogg-1.3.2/build-done ]; then
 cd libogg-1.3.2
 ./configure --enable-static --disable-shared --prefix=$PREFIX
 make
-sudo make install
+make install
 touch build-done
 cd ..
 fi
@@ -170,16 +188,16 @@ fi
 # ------------------------------------------------------------------------------------
 # libvorbis
 
-if [ ! -d libvorbis-1.3.4 ]; then
-curl -O http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.4.tar.gz
-tar -xf libvorbis-1.3.4.tar.gz
+if [ ! -d libvorbis-1.3.5 ]; then
+curl -O http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.gz
+tar -xf libvorbis-1.3.5.tar.gz
 fi
 
-if [ ! -f libvorbis-1.3.4/build-done ]; then
-cd libvorbis-1.3.4
+if [ ! -f libvorbis-1.3.5/build-done ]; then
+cd libvorbis-1.3.5
 ./configure --enable-static --disable-shared --prefix=$PREFIX
 make
-sudo make install
+make install
 touch build-done
 cd ..
 fi
@@ -198,7 +216,7 @@ cd flac-1.3.1
 chmod +x configure install-sh
 ./configure --enable-static --disable-shared --prefix=$PREFIX
 make
-sudo make install
+make install
 touch build-done
 cd ..
 fi
@@ -216,7 +234,7 @@ cd libsndfile-1.0.25
 sed -i -e "s/#include <Carbon.h>//" programs/sndfile-play.c
 ./configure --enable-static --disable-shared --disable-sqlite --prefix=$PREFIX
 make
-sudo make install
+make install
 touch build-done
 cd ..
 fi
@@ -224,20 +242,20 @@ fi
 # ------------------------------------------------------------------------------------
 # libgig
 
-if [ ! -d libgig-svn ]; then
-/opt/local/bin/svn co https://svn.linuxsampler.org/svn/libgig/trunk libgig-svn -r 2593
+if [ ! -d libgig-4.0.0 ]; then
+curl -O http://download.linuxsampler.org/packages/libgig-4.0.0.tar.bz2
+tar -xf libgig-4.0.0.tar.bz2
 fi
 
-if [ ! -f libgig-svn/build-done ]; then
-cd libgig-svn
-env PATH=/opt/local/bin:$PATH /opt/local/bin/aclocal -I /opt/local/share/aclocal
-env PATH=/opt/local/bin:$PATH /opt/local/bin/glibtoolize --force --copy
-env PATH=/opt/local/bin:$PATH /opt/local/bin/autoheader
-env PATH=/opt/local/bin:$PATH /opt/local/bin/automake --add-missing --copy
-env PATH=/opt/local/bin:$PATH /opt/local/bin/autoconf
+if [ ! -f libgig-4.0.0/build-done ]; then
+cd libgig-4.0.0
+if [ ! -f patched ]; then
+patch -p1 -i ../patches/libgig_fix-build.patch
+touch patched
+fi
 env PATH=/opt/local/bin:$PATH ./configure --enable-static --disable-shared --prefix=$PREFIX
 env PATH=/opt/local/bin:$PATH make
-sudo make install
+make install
 touch build-done
 cd ..
 fi
@@ -245,23 +263,19 @@ fi
 # ------------------------------------------------------------------------------------
 # linuxsampler
 
-if [ ! -d linuxsampler-svn ]; then
-/opt/local/bin/svn co https://svn.linuxsampler.org/svn/linuxsampler/trunk linuxsampler-svn -r 2593
+if [ ! -d linuxsampler-2.0.0 ]; then
+curl -O http://download.linuxsampler.org/packages/linuxsampler-2.0.0.tar.bz2
+tar -xf linuxsampler-2.0.0.tar.bz2
 fi
 
-if [ ! -f linuxsampler-svn/build-done ]; then
-cd linuxsampler-svn
-mkdir -p tmp
-cd tmp
-curl -L https://launchpad.net/~kxstudio-debian/+archive/ubuntu/libs/+files/linuxsampler-static_1.0.0%2Bsvn2677-1kxstudio1.debian.tar.xz -o linuxsampler-static.debian.tar.xz
-/opt/local/bin/7z x linuxsampler-static.debian.tar.xz
-/opt/local/bin/7z x linuxsampler-static.debian.tar
-cd ..
-mv tmp/debian/patches/*.patch .
-patch -p1 < allow-no-drivers-build.patch
-patch -p1 < disable-ladspa-fx.patch
-rm -r *.patch tmp/
+if [ ! -f linuxsampler-2.0.0/build-done ]; then
+cd linuxsampler-2.0.0
+if [ ! -f patched ]; then
+patch -p1 -i ../patches/linuxsampler_allow-no-drivers-build.patch
+patch -p1 -i ../patches/linuxsampler_disable-ladspa-fx.patch
 sed -i -e "s/HAVE_AU/HAVE_VST/" src/hostplugins/Makefile.am
+touch patched
+fi
 env PATH=/opt/local/bin:$PATH /opt/local/bin/aclocal -I /opt/local/share/aclocal
 env PATH=/opt/local/bin:$PATH /opt/local/bin/glibtoolize --force --copy
 env PATH=/opt/local/bin:$PATH /opt/local/bin/autoheader
@@ -269,13 +283,13 @@ env PATH=/opt/local/bin:$PATH /opt/local/bin/automake --add-missing --copy
 env PATH=/opt/local/bin:$PATH /opt/local/bin/autoconf
 env PATH=/opt/local/bin:$PATH ./configure \
 --enable-static --disable-shared --prefix=$PREFIX \
---disable-arts-driver --disable-artstest \
+--disable-arts-driver --disable-artstest --disable-instruments-db \
 --disable-asio-driver --disable-midishare-driver --disable-coremidi-driver --disable-coreaudio-driver --disable-mmemidi-driver
 env PATH=/opt/local/bin:$PATH ./scripts/generate_instrument_script_parser.sh
 sed -i -e "s/bison (GNU Bison) //" config.h
 env PATH=/opt/local/bin:$PATH make
-sudo make install
-sudo sed -i -e "s|-llinuxsampler|-llinuxsampler -L/opt/carla64/lib/libgig -lgig -lsndfile -lFLAC -lvorbisenc -lvorbis -logg -lm -lpthread -lsqlite3|" /opt/carla64/lib/pkgconfig/linuxsampler.pc
+make install
+sed -i -e "s|-llinuxsampler|-llinuxsampler -L$PREFIX/lib/libgig -lgig -lsndfile -lFLAC -lvorbisenc -lvorbis -logg -lm -lpthread|" $PREFIX/lib/pkgconfig/linuxsampler.pc
 touch build-done
 cd ..
 fi
@@ -292,7 +306,7 @@ if [ ! -f libffi-3.2.1/build-done ]; then
 cd libffi-3.2.1
 ./configure --enable-static --disable-shared --prefix=$PREFIX
 make
-sudo make install
+make install
 touch build-done
 cd ..
 fi
@@ -309,7 +323,7 @@ if [ ! -f gettext-0.18.3.2/build-done ]; then
 cd gettext-0.18.3.2
 env PATH=/opt/local/bin:$PATH ./configure --enable-static --disable-shared --prefix=$PREFIX
 env PATH=/opt/local/bin:$PATH make
-sudo make install
+make install
 touch build-done
 cd ..
 fi
@@ -317,19 +331,19 @@ fi
 # ------------------------------------------------------------------------------------
 # glib
 
-if [ ! -d glib-2.42.1 ]; then
-curl -O http://ftp.gnome.org/pub/GNOME/sources/glib/2.42/glib-2.42.1.tar.xz
-/opt/local/bin/7z x glib-2.42.1.tar.xz
-/opt/local/bin/7z x glib-2.42.1.tar
+if [ ! -d glib-2.42.2 ]; then
+curl -O http://gemmei.acc.umu.se/pub/GNOME/sources/glib/2.42/glib-2.42.2.tar.xz
+/opt/local/bin/7z x glib-2.42.2.tar.xz
+/opt/local/bin/7z x glib-2.42.2.tar
 fi
 
-if [ ! -f glib-2.42.1/build-done ]; then
-cd glib-2.42.1
+if [ ! -f glib-2.42.2/build-done ]; then
+cd glib-2.42.2
 chmod +x configure install-sh
-env CFLAGS="$CFLAGS -I$PREFIX/include" LDFLAGS="$LDFLAGS -L$PREFIX/lib" PATH=/opt/local/bin:$PATH ./configure --enable-static --disable-shared --prefix=$PREFIX
+env PATH=/opt/local/bin:$PATH ./configure --enable-static --disable-shared --prefix=$PREFIX
 env PATH=/opt/local/bin:$PATH make
-sudo touch /opt/carla64/bin/gtester-report
-sudo make install
+touch $PREFIX/bin/gtester-report
+make install
 touch build-done
 cd ..
 fi
@@ -337,9 +351,6 @@ fi
 # ------------------------------------------------------------------------------------
 # fltk
 
-ignore1()
-{
-
 if [ ! -d fltk-1.3.3 ]; then
 curl -O http://fltk.org/pub/fltk/1.3.3/fltk-1.3.3-source.tar.gz
 tar -xf fltk-1.3.3-source.tar.gz
@@ -347,17 +358,16 @@ fi
 
 if [ ! -f fltk-1.3.3/build-done ]; then
 cd fltk-1.3.3
-./configure --disable-shared --disable-debug --prefix=$PREFIX \
---enable-threads --disable-gl \
---enable-localjpeg --enable-localzlib  --enable-localpng
+./configure --prefix=$PREFIX \
+--disable-shared --disable-debug \
+--disable-threads --disable-gl \
+--enable-localjpeg --enable-localpng
 make
-sudo make install
+make install
 touch build-done
 cd ..
 fi
 
-}
-
 # ------------------------------------------------------------------------------------
 # fluidsynth
 
@@ -376,14 +386,14 @@ env LDFLAGS="$LDFLAGS -framework Carbon -framework CoreFoundation" \
  --without-readline \
  --enable-libsndfile-support
 make
-sudo make install
-sudo sed -i -e "s|-lfluidsynth|-lfluidsynth -lglib-2.0 -lgthread-2.0 -lsndfile -lFLAC -lvorbisenc -lvorbis -logg -lpthread -lm -liconv -lintl|" /opt/carla64/lib/pkgconfig/fluidsynth.pc
+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
 touch build-done
 cd ..
 fi
 
 # ------------------------------------------------------------------------------------
-# fftw3
+# fftw3 (needs to be last as it modifies C[XX]FLAGS)
 
 if [ ! -d fftw-3.3.4 ]; then
 curl -O http://www.fftw.org/fftw-3.3.4.tar.gz
@@ -391,17 +401,17 @@ tar -xf fftw-3.3.4.tar.gz
 fi
 
 if [ ! -f fftw-3.3.4/build-done ]; then
-export CFLAGS="-O2 -mtune=generic -msse -msse2 -ffast-math -mfpmath=sse -m$ARCH -fPIC -DPIC"
+export CFLAGS="-O3 -mtune=generic -msse -msse2 -ffast-math -mfpmath=sse -m$ARCH -fPIC -DPIC"
 export CXXFLAGS=$CFLAGS
 export LDFLAGS="-m$ARCH"
 cd fftw-3.3.4
 ./configure --enable-static --enable-sse2 --disable-shared --disable-debug --prefix=$PREFIX
 make
-sudo make install
+make install
 make clean
 ./configure --enable-static --enable-sse --enable-sse2 --enable-single --disable-shared --disable-debug --prefix=$PREFIX
 make
-sudo make install
+make install
 make clean
 touch build-done
 cd ..
@@ -418,20 +428,14 @@ build_base
 export ARCH=64
 build_base
 
-# ------------------------------------------------------------------------------------
-# switch to clang for Qt5
-
-export CC=clang
-export CXX=clang
-
 # ------------------------------------------------------------------------------------
 # set flags for qt stuff
 
-export CFLAGS="-O2 -mtune=generic -msse -msse2 -m64 -fPIC -DPIC"
+export CFLAGS="-O3 -mtune=generic -msse -msse2 -m64 -fPIC -DPIC"
 export CXXFLAGS=$CFLAGS
 export LDFLAGS="-m64"
 
-export PREFIX=/opt/carla
+export PREFIX=$TARGETDIR/carla
 export PATH=$PREFIX/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
 export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
 
@@ -441,29 +445,29 @@ export QMAKESPEC=macx-clang
 # ------------------------------------------------------------------------------------
 # qt5-base download
 
-if [ ! -d qtbase-opensource-src-5.3.2 ]; then
-curl -L http://download.qt-project.org/official_releases/qt/5.3/5.3.2/submodules/qtbase-opensource-src-5.3.2.tar.gz -o qtbase-opensource-src-5.3.2.tar.gz
-tar -xf qtbase-opensource-src-5.3.2.tar.gz
+if [ ! -d qtbase-opensource-src-5.4.2 ]; then
+curl -L http://download.qt-project.org/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.gz -o qtbase-opensource-src-5.4.2.tar.gz
+tar -xf qtbase-opensource-src-5.4.2.tar.gz
 fi
 
 # ------------------------------------------------------------------------------------
 # qt5-base (64bit, shared, framework)
 
-if [ ! -f qtbase-opensource-src-5.3.2/build-done ]; then
-cd qtbase-opensource-src-5.3.2
+if [ ! -f qtbase-opensource-src-5.4.2/build-done ]; then
+cd qtbase-opensource-src-5.4.2
 ./configure -release -shared -opensource -confirm-license -force-pkg-config -platform macx-clang -framework \
             -prefix $PREFIX -plugindir $PREFIX/lib/qt5/plugins -headerdir $PREFIX/include/qt5 \
-            -qt-freetype -qt-libjpeg -qt-libpng -qt-pcre -qt-sql-sqlite -qt-zlib -opengl desktop -qpa cocoa \
+            -qt-freetype -qt-libjpeg -qt-libpng -qt-pcre -opengl desktop -qpa cocoa \
             -no-directfb -no-eglfs -no-kms -no-linuxfb -no-mtdev -no-xcb -no-xcb-xlib \
             -no-sse3 -no-ssse3 -no-sse4.1 -no-sse4.2 -no-avx -no-avx2 -no-mips_dsp -no-mips_dspr2 \
-            -no-cups -no-dbus -no-evdev -no-fontconfig -no-harfbuzz -no-iconv -no-icu -no-gif -no-glib -no-nis -no-openssl -no-pch -no-sql-ibase -no-sql-odbc \
+            -no-cups -no-dbus -no-evdev -no-fontconfig -no-harfbuzz -no-gif -no-glib -no-nis -no-openssl -no-pch -no-sql-ibase -no-sql-odbc \
             -no-audio-backend -no-qml-debug -no-separate-debug-info \
             -no-compile-examples -nomake examples -nomake tests -make libs -make tools
 make -j 2
-sudo make install
-sudo ln -s /opt/carla/lib/QtCore.framework/Headers    /opt/carla/include/qt5/QtCore
-sudo ln -s /opt/carla/lib/QtGui.framework/Headers     /opt/carla/include/qt5/QtGui
-sudo ln -s /opt/carla/lib/QtWidgets.framework/Headers /opt/carla/include/qt5/QtWidgets
+make install
+ln -s $PREFIX/lib/QtCore.framework/Headers    $PREFIX/include/qt5/QtCore
+ln -s $PREFIX/lib/QtGui.framework/Headers     $PREFIX/include/qt5/QtGui
+ln -s $PREFIX/lib/QtWidgets.framework/Headers $PREFIX/include/qt5/QtWidgets
 touch build-done
 cd ..
 fi
@@ -471,16 +475,16 @@ fi
 # ------------------------------------------------------------------------------------
 # qt5-mac-extras
 
-if [ ! -d qtmacextras-opensource-src-5.3.2 ]; then
-curl -L http://download.qt-project.org/official_releases/qt/5.3/5.3.2/submodules/qtmacextras-opensource-src-5.3.2.tar.gz -o qtmacextras-opensource-src-5.3.2.tar.gz
-tar -xf qtmacextras-opensource-src-5.3.2.tar.gz
+if [ ! -d qtmacextras-opensource-src-5.4.2 ]; then
+curl -L http://download.qt-project.org/official_releases/qt/5.4/5.4.2/submodules/qtmacextras-opensource-src-5.4.2.tar.gz -o qtmacextras-opensource-src-5.4.2.tar.gz
+tar -xf qtmacextras-opensource-src-5.4.2.tar.gz
 fi
 
-if [ ! -f qtmacextras-opensource-src-5.3.2/build-done ]; then
-cd qtmacextras-opensource-src-5.3.2
+if [ ! -f qtmacextras-opensource-src-5.4.2/build-done ]; then
+cd qtmacextras-opensource-src-5.4.2
 qmake
 make -j 2
-sudo make install
+make install
 touch build-done
 cd ..
 fi
@@ -488,64 +492,20 @@ fi
 # ------------------------------------------------------------------------------------
 # qt5-svg
 
-if [ ! -d qtsvg-opensource-src-5.3.2 ]; then
-curl -L http://download.qt-project.org/official_releases/qt/5.3/5.3.2/submodules/qtsvg-opensource-src-5.3.2.tar.gz -o qtsvg-opensource-src-5.3.2.tar.gz
-tar -xf qtsvg-opensource-src-5.3.2.tar.gz
+if [ ! -d qtsvg-opensource-src-5.4.2 ]; then
+curl -L http://download.qt-project.org/official_releases/qt/5.4/5.4.2/submodules/qtsvg-opensource-src-5.4.2.tar.gz -o qtsvg-opensource-src-5.4.2.tar.gz
+tar -xf qtsvg-opensource-src-5.4.2.tar.gz
 fi
 
-if [ ! -f qtsvg-opensource-src-5.3.2/build-done ]; then
-cd qtsvg-opensource-src-5.3.2
+if [ ! -f qtsvg-opensource-src-5.4.2/build-done ]; then
+cd qtsvg-opensource-src-5.4.2
 qmake
 make -j 2
-sudo make install
+make install
 touch build-done
 cd ..
 fi
 
-# ------------------------------------------------------------------------------------
-# qt5-multimedia
-
-ignore2()
-{
-
-if [ ! -d qtmultimedia-opensource-src-5.3.2 ]; then
-curl -L http://download.qt-project.org/official_releases/qt/5.3/5.3.2/submodules/qtmultimedia-opensource-src-5.3.2.tar.gz -o qtmultimedia-opensource-src-5.3.2.tar.gz
-tar -xf qtmultimedia-opensource-src-5.3.2.tar.gz
-fi
-
-if [ ! -f qtmultimedia-opensource-src-5.3.2/build-done ]; then
-cd qtmultimedia-opensource-src-5.3.2
-qmake
-make -j 2
-sudo make install
-touch build-done
-cd ..
-fi
-
-}
-
-# ------------------------------------------------------------------------------------
-# qt5-webkit
-
-ignore3()
-{
-
-if [ ! -d qtwebkit-opensource-src-5.3.2 ]; then
-curl -L http://download.qt-project.org/official_releases/qt/5.3/5.3.2/submodules/qtwebkit-opensource-src-5.3.2.tar.gz -o qtwebkit-opensource-src-5.3.2.tar.gz
-tar -xf qtwebkit-opensource-src-5.3.2.tar.gz
-fi
-
-if [ ! -f qtwebkit-opensource-src-5.3.2/build-done ]; then
-cd qtwebkit-opensource-src-5.3.2
-qmake
-make -j 2
-sudo make install
-touch build-done
-cd ..
-fi
-
-}
-
 # ------------------------------------------------------------------------------------
 # python
 
@@ -558,7 +518,7 @@ if [ ! -f Python-3.4.2/build-done ]; then
 cd Python-3.4.2
 ./configure --prefix=$PREFIX
 make
-sudo make install
+make install
 touch build-done
 cd ..
 fi
@@ -575,7 +535,7 @@ if [ ! -f sip-4.16.5/build-done ]; then
 cd sip-4.16.5
 python3 configure.py
 make
-sudo make install
+make install
 touch build-done
 cd ..
 fi
@@ -590,35 +550,27 @@ fi
 
 if [ ! -f pyliblo-0.9.2/build-done ]; then
 cd pyliblo-0.9.2
-export OLD_CFLAGS="$CFLAGS"
-export OLD_LDFLAGS="$LDFLAGS"
-export CFLAGS="$CFLAGS -I/opt/carla64/include"
-export LDFLAGS="$LDFLAGS -L/opt/carla64/lib"
 python3 setup.py build
-sudo python3 setup.py install --prefix=$PREFIX
+python3 setup.py install --prefix=$PREFIX
 touch build-done
-export CFLAGS="$OLD_CFLAGS"
-export LDFLAGS="$OLD_LDFLAGS"
-unset OLD_CFLAGS
-unset OLD_LDFLAGS
 cd ..
 fi
 
 # ------------------------------------------------------------------------------------
 # pyqt5
 
-if [ ! -d PyQt-gpl-5.3.2 ]; then
-curl -L http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.3.2/PyQt-gpl-5.3.2.tar.gz -o PyQt-gpl-5.3.2.tar.gz
-tar -xf PyQt-gpl-5.3.2.tar.gz
+if [ ! -d PyQt-gpl-5.4.2 ]; then
+curl -L http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.4.2/PyQt-gpl-5.4.2.tar.gz -o PyQt-gpl-5.4.2.tar.gz
+tar -xf PyQt-gpl-5.4.2.tar.gz
 fi
 
-if [ ! -f PyQt-gpl-5.3.2/build-done ]; then
-cd PyQt-gpl-5.3.2
-sed -i -e "s/# Read the details./pylib_dir = ''/" configure.py
-sed -i -e "s/qmake_QT=['webkitwidgets']/qmake_QT=['webkitwidgets', 'printsupport']/" configure.py
+if [ ! -f PyQt-gpl-5.4.2/build-done ]; then
+cd PyQt-gpl-5.4.2
+# sed -i -e "s/# Read the details./pylib_dir = ''/" configure.py
+# sed -i -e "s/qmake_QT=['webkitwidgets']/qmake_QT=['webkitwidgets', 'printsupport']/" configure.py
 python3 configure.py --confirm-license -c
 make
-sudo make install
+make install
 touch build-done
 cd ..
 fi
@@ -635,7 +587,7 @@ if [ ! -f cx_Freeze-4.3.3/build-done ]; then
 cd cx_Freeze-4.3.3
 sed  -i -e 's/"python%s.%s"/"python%s.%sm"/' setup.py
 python3 setup.py build
-sudo python3 setup.py install --prefix=$PREFIX
+python3 setup.py install --prefix=$PREFIX
 touch build-done
 cd ..
 fi
diff --git a/data/macos/env.sh b/data/macos/env.sh
index 3cb5e569f..67b493c12 100644
--- a/data/macos/env.sh
+++ b/data/macos/env.sh
@@ -12,8 +12,8 @@ export CXXFLAGS=-m64
 export LDLAGS=-m64
 unset CPPFLAGS
 
-export PATH=/opt/carla/bin:/opt/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
-export PKG_CONFIG_PATH=/opt/carla/lib/pkgconfig:/opt/carla64/lib/pkgconfig
+export PATH=$HOME/Builds/carla/bin:$HOME/Builds/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
+export PKG_CONFIG_PATH=$HOME/Builds/carla/lib/pkgconfig:$HOME/Builds/carla64/lib/pkgconfig
 
 export DEFAULT_QT=5
 export PYUIC5=/opt/carla/bin/pyuic5
diff --git a/source/backend/engine/CarlaEngine.cpp b/source/backend/engine/CarlaEngine.cpp
index 3d872609b..910220e2d 100644
--- a/source/backend/engine/CarlaEngine.cpp
+++ b/source/backend/engine/CarlaEngine.cpp
@@ -1159,9 +1159,11 @@ void CarlaEngine::callback(const EngineCallbackOpcode action, const uint pluginI
 
         try {
             pData->callback(pData->callbackPtr, action, pluginId, value1, value2, value3, valueStr);
+#if defined(CARLA_OS_LINUX) && defined(__arm__)
         } catch (__cxxabiv1::__forced_unwind&) {
             carla_stderr2("Caught forced unwind exception in callback");
             throw;
+#endif
         } catch (...) {
             carla_safe_exception("callback", __FILE__, __LINE__);
         }
diff --git a/source/modules/distrho/DistrhoUtils.hpp b/source/modules/distrho/DistrhoUtils.hpp
index 874ec41e2..aa95674a2 100644
--- a/source/modules/distrho/DistrhoUtils.hpp
+++ b/source/modules/distrho/DistrhoUtils.hpp
@@ -33,7 +33,7 @@
 # include <stdint.h>
 #endif
 
-#if defined(DISTRHO_OS_MAC) && ! defined(CARLA_OS_MAC)
+#if 0 // defined(DISTRHO_OS_MAC) && ! defined(CARLA_OS_MAC)
 namespace std {
 inline float fmin(float __x, float __y)
   { return __builtin_fminf(__x, __y); }
diff --git a/source/utils/CarlaMathUtils.hpp b/source/utils/CarlaMathUtils.hpp
index b2e37df2b..9d4158a5f 100644
--- a/source/utils/CarlaMathUtils.hpp
+++ b/source/utils/CarlaMathUtils.hpp
@@ -203,7 +203,7 @@ void carla_zeroFloats(float floats[], const std::size_t count) noexcept
 // --------------------------------------------------------------------------------------------------------------------
 // Missing functions in OSX.
 
-#if defined(CARLA_OS_MAC) && ! defined(DISTRHO_OS_MAC)
+#if 0 // defined(CARLA_OS_MAC) && ! defined(DISTRHO_OS_MAC)
 namespace std {
 inline float fmin(float __x, float __y)
   { return __builtin_fminf(__x, __y); }
diff --git a/source/utils/CarlaPipeUtils.cpp b/source/utils/CarlaPipeUtils.cpp
index 77f02ce99..ca8dd0658 100644
--- a/source/utils/CarlaPipeUtils.cpp
+++ b/source/utils/CarlaPipeUtils.cpp
@@ -33,8 +33,7 @@
 
 #include <clocale>
 
-#ifdef CARLA_OS_WIN
-# include <ctime>
+#if defined(CARLA_OS_MAC) || defined(CARLA_OS_WINDOWS)
 # include "juce_core.h"
 #else
 # include <cerrno>
@@ -155,20 +154,20 @@ ssize_t WriteFileNonBlock(const HANDLE pipeh, const HANDLE cancelh, const void*
 // -----------------------------------------------------------------------
 // getMillisecondCounter
 
+#if ! (defined(CARLA_OS_MAC) || defined(CARLA_OS_WINDOWS))
 static uint32_t lastMSCounterValue = 0;
+#endif
 
 static inline
 uint32_t getMillisecondCounter() noexcept
 {
-    uint32_t now;
-
-#ifdef CARLA_OS_WIN
-    now = static_cast<uint32_t>(timeGetTime());
+#if defined(CARLA_OS_MAC) || defined(CARLA_OS_WINDOWS)
+    return juce::Time::getMillisecondCounter();
 #else
+    uint32_t now;
     timespec t;
     clock_gettime(CLOCK_MONOTONIC, &t);
     now =  t.tv_sec * 1000 + t.tv_nsec / 1000000;
-#endif
 
     if (now < lastMSCounterValue)
     {
@@ -184,6 +183,7 @@ uint32_t getMillisecondCounter() noexcept
     }
 
     return now;
+#endif
 }
 
 // -----------------------------------------------------------------------