From c62cd71504d8f23522b22db1e5a9e8a5a7dd30f7 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Fri, 27 Sep 2019 21:43:31 +0100
Subject: [PATCH 1/5] added required package for jackd compilation

---
 distributions/raspijamulus.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distributions/raspijamulus.sh b/distributions/raspijamulus.sh
index 4c9564ca..515754ec 100755
--- a/distributions/raspijamulus.sh
+++ b/distributions/raspijamulus.sh
@@ -5,7 +5,7 @@ OPUS="opus-1.1"
 NCORES=$(nproc)
 
 # install required packages
-pkgs='build-essential qt5-default'
+pkgs='build-essential qt5-default libasound-dev'
 if ! dpkg -s $pkgs >/dev/null 2>&1; then
   read -p "Do you want to install missing packages? " -n 1 -r
   echo

From 83bed4d2a3f76147bfc67264e2ddc39f895ec55b Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Fri, 27 Sep 2019 22:12:43 +0100
Subject: [PATCH 2/5] added fluidsynth compile requirements

---
 distributions/raspijamulus.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distributions/raspijamulus.sh b/distributions/raspijamulus.sh
index 515754ec..91479a4c 100755
--- a/distributions/raspijamulus.sh
+++ b/distributions/raspijamulus.sh
@@ -5,7 +5,7 @@ OPUS="opus-1.1"
 NCORES=$(nproc)
 
 # install required packages
-pkgs='build-essential qt5-default libasound-dev'
+pkgs='build-essential qt5-default libasound-dev cmake libglib2.0-dev'
 if ! dpkg -s $pkgs >/dev/null 2>&1; then
   read -p "Do you want to install missing packages? " -n 1 -r
   echo

From 6f78c100cab8acc7468899bbfd168ba8eec2fad6 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Sat, 28 Sep 2019 06:23:11 +0100
Subject: [PATCH 3/5] some fixes for compilation

---
 distributions/raspijamulus.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/distributions/raspijamulus.sh b/distributions/raspijamulus.sh
index 91479a4c..57973475 100755
--- a/distributions/raspijamulus.sh
+++ b/distributions/raspijamulus.sh
@@ -5,7 +5,7 @@ OPUS="opus-1.1"
 NCORES=$(nproc)
 
 # install required packages
-pkgs='build-essential qt5-default libasound-dev cmake libglib2.0-dev'
+pkgs='alsamixergui build-essential qt5-default libasound2-dev cmake libglib2.0-dev'
 if ! dpkg -s $pkgs >/dev/null 2>&1; then
   read -p "Do you want to install missing packages? " -n 1 -r
   echo
@@ -66,7 +66,7 @@ fi
 
 # compile Jamulus with external Opus library
 cd ..
-qmake "CONFIG+=opus_shared_lib" "INCLUDEPATH+=distributions/${OPUS}/include" "QMAKE_LIBDIR+=distributions/${OPUS}/.libs" Jamulus.pro
+qmake "CONFIG+=opus_shared_lib" "INCLUDEPATH+=distributions/${OPUS}/include" "QMAKE_LIBDIR+=distributions/${OPUS}/.libs" "INCLUDEPATH+=distributions/jack2/common" Jamulus.pro
 make -j${NCORES}
 
 # get first USB audio sound card device

From 87e57b5c365c8e6e6ac04971ac75b422cd47172a Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Sat, 28 Sep 2019 08:30:04 +0100
Subject: [PATCH 4/5] fix Jamulus compilation issue and set audio realtime
 rights

---
 distributions/raspijamulus.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/distributions/raspijamulus.sh b/distributions/raspijamulus.sh
index 57973475..ea75e8ff 100755
--- a/distributions/raspijamulus.sh
+++ b/distributions/raspijamulus.sh
@@ -43,6 +43,14 @@ else
   cp build/common/*.so build/jack
   cp build/example-clients/*.so build/jack
   cd ..
+
+  # give audio group rights to do realtime
+  if grep -Fq "@audio" /etc/security/limits.conf; then
+    echo "audio group already has realtime rights"
+  else
+    sudo sh -c 'echo "@audio   -  rtprio   95" >> /etc/security/limits.conf'
+    sudo sh -c 'echo "@audio   -  memlock  unlimited" >> /etc/security/limits.conf'
+  fi
 fi
 
 # optional: FluidSynth synthesizer
@@ -66,7 +74,7 @@ fi
 
 # compile Jamulus with external Opus library
 cd ..
-qmake "CONFIG+=opus_shared_lib" "INCLUDEPATH+=distributions/${OPUS}/include" "QMAKE_LIBDIR+=distributions/${OPUS}/.libs" "INCLUDEPATH+=distributions/jack2/common" Jamulus.pro
+qmake "CONFIG+=opus_shared_lib" "INCLUDEPATH+=distributions/${OPUS}/include" "QMAKE_LIBDIR+=distributions/${OPUS}/.libs" "INCLUDEPATH+=distributions/jack2/common" "QMAKE_LIBDIR+=distributions/jack2/build/common" Jamulus.pro
 make -j${NCORES}
 
 # get first USB audio sound card device

From 5427cb21d5d0bbbe588c7458baeedb546be917e2 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Sat, 28 Sep 2019 09:31:22 +0200
Subject: [PATCH 5/5] try out Travis compilation with xcode11 since we got
 feedback that Jamulus does not compile on newest xcode

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 831ffaf8..a88e1381 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ matrix:
     #    repo: corrados/jamulus
     #    tags: true
   - os: osx
-    osx_image: xcode7.2
+    osx_image: xcode11
     before_install:
     - brew install qt5
     - brew link qt5 --force