From 58fa22074e10fc0d6df604ae3f07909f8e7ad53b Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sat, 14 Feb 2015 14:18:44 +0000
Subject: [PATCH] Update OSX libs and environment

---
 data/macos/build-deps.sh | 73 ++++++++++++++++++++--------------------
 data/macos/build.sh      |  4 +++
 data/macos/env.sh        |  4 +++
 3 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/data/macos/build-deps.sh b/data/macos/build-deps.sh
index c7d9a870b..6aa127aee 100755
--- a/data/macos/build-deps.sh
+++ b/data/macos/build-deps.sh
@@ -96,13 +96,13 @@ fi
 # ------------------------------------------------------------------------------------
 # file/magic
 
-if [ ! -d file-5.19 ]; then
-curl -O ftp://ftp.astron.com/pub/file/file-5.19.tar.gz
-tar -xf file-5.19.tar.gz
+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
 fi
 
-if [ ! -f file-5.19/build-done ]; then
-cd file-5.19
+if [ ! -f file-5.22/build-done ]; then
+cd file-5.22
 ./configure --enable-static --disable-shared --prefix=$PREFIX
 make
 sudo make install
@@ -130,13 +130,13 @@ fi
 # ------------------------------------------------------------------------------------
 # mxml
 
-if [ ! -d mxml-2.8 ]; then
-curl -O http://www.msweet.org/files/project3/mxml-2.8.tar.gz
-tar -xf mxml-2.8.tar.gz
+if [ ! -d mxml-2.9 ]; then
+curl -O http://www.msweet.org/files/project3/mxml-2.9.tar.gz
+tar -xf mxml-2.9.tar.gz
 fi
 
-if [ ! -f mxml-2.8/build-done ]; then
-cd mxml-2.8
+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/
@@ -183,14 +183,14 @@ fi
 # ------------------------------------------------------------------------------------
 # flac
 
-if [ ! -d flac-1.3.0 ]; then
-curl -O https://svn.xiph.org/releases/flac/flac-1.3.0.tar.xz
-/opt/local/bin/7z x flac-1.3.0.tar.xz
-/opt/local/bin/7z x flac-1.3.0.tar
+if [ ! -d flac-1.3.1 ]; then
+curl -O https://svn.xiph.org/releases/flac/flac-1.3.1.tar.xz
+/opt/local/bin/7z x flac-1.3.1.tar.xz
+/opt/local/bin/7z x flac-1.3.1.tar
 fi
 
-if [ ! -f flac-1.3.0/build-done ]; then
-cd flac-1.3.0
+if [ ! -f flac-1.3.1/build-done ]; then
+cd flac-1.3.1
 chmod +x configure install-sh
 ./configure --enable-static --disable-shared --prefix=$PREFIX
 make
@@ -221,7 +221,7 @@ fi
 # libgig
 
 if [ ! -d libgig-svn ]; then
-/opt/local/bin/svn co https://svn.linuxsampler.org/svn/libgig/trunk libgig-svn
+/opt/local/bin/svn co https://svn.linuxsampler.org/svn/libgig/trunk libgig-svn -r 2593
 fi
 
 if [ ! -f libgig-svn/build-done ]; then
@@ -242,14 +242,14 @@ fi
 # linuxsampler
 
 if [ ! -d linuxsampler-svn ]; then
-/opt/local/bin/svn co https://svn.linuxsampler.org/svn/linuxsampler/trunk linuxsampler-svn
+/opt/local/bin/svn co https://svn.linuxsampler.org/svn/linuxsampler/trunk linuxsampler-svn -r 2593
 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%2Bsvn2593-1kxstudio5.debian.tar.xz -o linuxsampler-static.debian.tar.xz
+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 ..
@@ -263,7 +263,8 @@ 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
-env 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 \
 --disable-arts-driver --disable-artstest \
 --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
@@ -278,13 +279,13 @@ fi
 # ------------------------------------------------------------------------------------
 # libffi
 
-if [ ! -d libffi-3.1 ]; then
-curl -O ftp://sourceware.org/pub/libffi/libffi-3.1.tar.gz
-tar -xf libffi-3.1.tar.gz
+if [ ! -d libffi-3.2.1 ]; then
+curl -O ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz
+tar -xf libffi-3.2.1.tar.gz
 fi
 
-if [ ! -f libffi-3.1/build-done ]; then
-cd libffi-3.1
+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
@@ -312,14 +313,14 @@ fi
 # ------------------------------------------------------------------------------------
 # glib
 
-if [ ! -d glib-2.42.0 ]; then
-curl -O http://ftp.gnome.org/pub/GNOME/sources/glib/2.42/glib-2.42.0.tar.xz
-/opt/local/bin/7z x glib-2.42.0.tar.xz
-/opt/local/bin/7z x glib-2.42.0.tar
+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
 fi
 
-if [ ! -f glib-2.42.0/build-done ]; then
-cd glib-2.42.0
+if [ ! -f glib-2.42.1/build-done ]; then
+cd glib-2.42.1
 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 make
@@ -492,13 +493,13 @@ fi
 # ------------------------------------------------------------------------------------
 # sip
 
-if [ ! -d sip-4.16.3 ]; then
-curl -L http://sourceforge.net/projects/pyqt/files/sip/sip-4.16.3/sip-4.16.3.tar.gz -o sip-4.16.3.tar.gz
-tar -xf sip-4.16.3.tar.gz
+if [ ! -d sip-4.16.5 ]; then
+curl -L http://sourceforge.net/projects/pyqt/files/sip/sip-4.16.5/sip-4.16.5.tar.gz -o sip-4.16.5.tar.gz
+tar -xf sip-4.16.5.tar.gz
 fi
 
-if [ ! -f sip-4.16.3/build-done ]; then
-cd sip-4.16.3
+if [ ! -f sip-4.16.5/build-done ]; then
+cd sip-4.16.5
 python3 configure.py
 make
 sudo make install
diff --git a/data/macos/build.sh b/data/macos/build.sh
index 2763ff81d..307b0041c 100755
--- a/data/macos/build.sh
+++ b/data/macos/build.sh
@@ -12,6 +12,10 @@ export MACOS="true"
 export CC=clang
 export CXX=clang++
 export CXFREEZE="/opt/carla/bin/cxfreeze --include-modules=re,sip,subprocess,inspect"
+export DEFAULT_QT=5
+export PYUIC5=/opt/carla/bin/pyuic5
+
+unset CPPFLAGS
 
 ##############################################################################################
 # Complete 64bit build
diff --git a/data/macos/env.sh b/data/macos/env.sh
index 73419a4e1..3cb5e569f 100644
--- a/data/macos/env.sh
+++ b/data/macos/env.sh
@@ -10,6 +10,10 @@ export CXX=clang++
 export CFLAGS=-m64
 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 DEFAULT_QT=5
+export PYUIC5=/opt/carla/bin/pyuic5