From 465b1c58551b83e761ccbb84ba9fb91b299e5eea Mon Sep 17 00:00:00 2001
From: Andreas Butti <andreas.butti@gmail.com>
Date: Mon, 11 Feb 2019 19:52:08 +0100
Subject: [PATCH 1/5] Mac Build

---
 mac-setup/README.md                          |  4 ++--
 mac-setup/{build-sox.sh => build-sndfile.sh} |  0
 mac-setup/sox-pc.sh                          | 22 --------------------
 3 files changed, 2 insertions(+), 24 deletions(-)
 rename mac-setup/{build-sox.sh => build-sndfile.sh} (100%)
 delete mode 100755 mac-setup/sox-pc.sh

diff --git a/mac-setup/README.md b/mac-setup/README.md
index c3fd0351..ca1214a3 100644
--- a/mac-setup/README.md
+++ b/mac-setup/README.md
@@ -81,10 +81,10 @@ export PATH="$HOME/.local/bin:$HOME/gtk/inst/bin:$PATH"
 autoreconf -if && ./configure --enable-cxx --prefix=$HOME/gtk/inst
 ````
 
-#### 5. PortAudio
+#### 5. sndfile
 
 ````bash
-./build-sox.sh
+./build-sndfile.sh
 ````
 
 
diff --git a/mac-setup/build-sox.sh b/mac-setup/build-sndfile.sh
similarity index 100%
rename from mac-setup/build-sox.sh
rename to mac-setup/build-sndfile.sh
diff --git a/mac-setup/sox-pc.sh b/mac-setup/sox-pc.sh
deleted file mode 100755
index 7db18490..00000000
--- a/mac-setup/sox-pc.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-echo "prefix="
-echo "exec_prefix="
-
-libdir1=`pwd`/sox-code/build/src
-echo "libdir1=$libdir1"
-
-libdir2=`pwd`/sox-code/build/libgsm
-echo "libdir2=$libdir2"
-
-libdir3=`pwd`/sox-code/build/lpc10
-echo "libdir3=$libdir3"
-
-incdir=`pwd`/sox-code/src
-echo "includedir=$incdir"
-echo ""
-echo "Name: SoX"
-echo "Description: Audio file format and effects library"
-echo "Version: 14.4.2"
-echo "URL: http://sox.sourceforge.net"
-echo "Libs: -L\${libdir1} -L\${libdir2} -L\${libdir3} -llibsox -llpc10 -lgsm -lgomp"
-echo "Libs.private: "
-echo "Cflags: -I\${includedir}"

From d844a38a5c386c39648781afbc7dedd9031357e9 Mon Sep 17 00:00:00 2001
From: Andreas Butti <andreas.butti@gmail.com>
Date: Mon, 11 Feb 2019 20:03:01 +0100
Subject: [PATCH 2/5] Mac Build

---
 mac-setup/build-sndfile.sh | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/mac-setup/build-sndfile.sh b/mac-setup/build-sndfile.sh
index bae14b26..07fce954 100755
--- a/mac-setup/build-sndfile.sh
+++ b/mac-setup/build-sndfile.sh
@@ -3,15 +3,9 @@ cd "${0%/*}"
 
 export PATH="$HOME/.local/bin:$HOME/gtk/inst/bin:$PATH"
 
-# Generation does not work... (really buggy with CMake, but does not work at all with automake on MingW)
-# So do this manually...
-./sox-pc.sh > $HOME/gtk/inst/lib/pkgconfig/sox.pc
+git clone https://github.com/erikd/libsndfile.git
 
-
-git clone https://git.code.sf.net/p/sox/code sox-code
-
-cd sox-code
-git checkout tags/sox-14.4.2 -b sox-14.4.2
+cd libsndfile
 
 mkdir build
 cd build

From a1ff7d4c8e5833ce9f87a876f9c681416e710786 Mon Sep 17 00:00:00 2001
From: Andreas Butti <andreas.butti@gmail.com>
Date: Mon, 11 Feb 2019 20:07:12 +0100
Subject: [PATCH 3/5] Mac build

---
 mac-setup/build-sndfile.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mac-setup/build-sndfile.sh b/mac-setup/build-sndfile.sh
index 07fce954..839646f2 100755
--- a/mac-setup/build-sndfile.sh
+++ b/mac-setup/build-sndfile.sh
@@ -12,3 +12,4 @@ cd build
 
 $HOME/gtk/inst/bin/cmake -DCMAKE_INSTALL_PREFIX:PATH=$HOME/gtk/inst ..
 make -j8
+make install

From 21144a07da74a708736f56e3e87f1bdded9ba012 Mon Sep 17 00:00:00 2001
From: Andreas Butti <andreas@Andreass-MBP.fritz.box>
Date: Mon, 11 Feb 2019 20:42:05 +0100
Subject: [PATCH 4/5] Mac build working

---
 mac-setup/.gitignore       |  2 ++
 mac-setup/build-sndfile.sh |  4 ++++
 mac-setup/portaudio-2.0.pc | 12 ++++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 mac-setup/portaudio-2.0.pc

diff --git a/mac-setup/.gitignore b/mac-setup/.gitignore
index 6c75be05..fc99e4b3 100644
--- a/mac-setup/.gitignore
+++ b/mac-setup/.gitignore
@@ -12,3 +12,5 @@ gtk-mac-integration
 portaudio
 pa_stable_*.tgz
 sox-code
+libsndfile
+
diff --git a/mac-setup/build-sndfile.sh b/mac-setup/build-sndfile.sh
index 07fce954..0012b9e9 100755
--- a/mac-setup/build-sndfile.sh
+++ b/mac-setup/build-sndfile.sh
@@ -12,3 +12,7 @@ cd build
 
 $HOME/gtk/inst/bin/cmake -DCMAKE_INSTALL_PREFIX:PATH=$HOME/gtk/inst ..
 make -j8
+
+# Fix linker flags
+cp portaudio-2.0.pc /Users/andreas/gtk/inst/lib/pkgconfig
+
diff --git a/mac-setup/portaudio-2.0.pc b/mac-setup/portaudio-2.0.pc
new file mode 100644
index 00000000..7f4432c9
--- /dev/null
+++ b/mac-setup/portaudio-2.0.pc
@@ -0,0 +1,12 @@
+prefix=/Users/andreas/gtk/inst
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: PortAudio
+Description: Portable audio I/O
+Requires:
+Version: 19
+
+Libs: -L${libdir} -lportaudio
+Cflags: -I${includedir} 

From 736276d098fd1da3b2d63cf6fbe8aefd7ba27809 Mon Sep 17 00:00:00 2001
From: Andreas Butti <andreas@Andreass-MBP.fritz.box>
Date: Mon, 11 Feb 2019 20:47:21 +0100
Subject: [PATCH 5/5] fix path

---
 mac-setup/build-sndfile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mac-setup/build-sndfile.sh b/mac-setup/build-sndfile.sh
index fb5620a5..feb90b5a 100755
--- a/mac-setup/build-sndfile.sh
+++ b/mac-setup/build-sndfile.sh
@@ -15,5 +15,5 @@ make -j8
 make install
 
 # Fix linker flags
-cp portaudio-2.0.pc /Users/andreas/gtk/inst/lib/pkgconfig
+cp portaudio-2.0.pc $HOME/gtk/inst/lib/pkgconfig