From 7ae0bc8bad5d3944f75116af6a93c6194f5288fe Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sun, 23 Jan 2022 15:37:53 +0100 Subject: [PATCH 1/6] fix some install packets --- distributions/raspijamulus.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributions/raspijamulus.sh b/distributions/raspijamulus.sh index e277b521f2..552f208927 100755 --- a/distributions/raspijamulus.sh +++ b/distributions/raspijamulus.sh @@ -5,7 +5,7 @@ OPUS="opus-1.3.1" NCORES=$(nproc) # install required packages -pkgs='alsamixergui build-essential qt5-default libasound2-dev cmake libglib2.0-dev' +pkgs='alsamixergui build-essential qt5-qmake qtdeclarative5-dev libjack-jackd2-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 64f3e14ce385120860e741f7f2f5c391c525d634 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sun, 23 Jan 2022 15:39:38 +0100 Subject: [PATCH 2/6] we need a newer jack2 version, otherwise it will not compile anymore --- distributions/raspijamulus.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributions/raspijamulus.sh b/distributions/raspijamulus.sh index 552f208927..bc0e30bec3 100755 --- a/distributions/raspijamulus.sh +++ b/distributions/raspijamulus.sh @@ -59,7 +59,7 @@ if [ -d "jack2" ]; then else git clone https://github.com/jackaudio/jack2.git cd jack2 - git checkout v1.9.12 + git checkout v1.9.20 ./waf configure --alsa --prefix=/usr/local --libdir=$(pwd)/build ./waf -j${NCORES} mkdir build/jack From 2d2330d3be009d3614c27ea7405e20a33eacf9f7 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sun, 23 Jan 2022 15:45:21 +0100 Subject: [PATCH 3/6] added missing install packet --- distributions/raspijamulus.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributions/raspijamulus.sh b/distributions/raspijamulus.sh index bc0e30bec3..24eaf5a0d3 100755 --- a/distributions/raspijamulus.sh +++ b/distributions/raspijamulus.sh @@ -5,7 +5,7 @@ OPUS="opus-1.3.1" NCORES=$(nproc) # install required packages -pkgs='alsamixergui build-essential qt5-qmake qtdeclarative5-dev libjack-jackd2-dev cmake libglib2.0-dev' +pkgs='alsamixergui build-essential qt5-qmake qtdeclarative5-dev qttools5-dev-tools libjack-jackd2-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 ba78bfbc7716708a185fc6cd18b115455780b7b6 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Mon, 24 Jan 2022 19:07:02 +0100 Subject: [PATCH 4/6] added libasound2-dev again since it is needed for jack2 compilation --- distributions/raspijamulus.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributions/raspijamulus.sh b/distributions/raspijamulus.sh index 24eaf5a0d3..71b1b2d536 100755 --- a/distributions/raspijamulus.sh +++ b/distributions/raspijamulus.sh @@ -5,7 +5,7 @@ OPUS="opus-1.3.1" NCORES=$(nproc) # install required packages -pkgs='alsamixergui build-essential qt5-qmake qtdeclarative5-dev qttools5-dev-tools libjack-jackd2-dev cmake libglib2.0-dev' +pkgs='alsamixergui build-essential qt5-qmake qtdeclarative5-dev qttools5-dev-tools libjack-jackd2-dev 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 From 00374c6b00004baa416b5bfce6cafda193d7799c Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Mon, 24 Jan 2022 19:10:21 +0100 Subject: [PATCH 5/6] remove libjack-jackd2-dev since in the script we use our custom jack2 headers and libraries for Jamulus compilation --- distributions/raspijamulus.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributions/raspijamulus.sh b/distributions/raspijamulus.sh index 71b1b2d536..e619cbbdfb 100755 --- a/distributions/raspijamulus.sh +++ b/distributions/raspijamulus.sh @@ -5,7 +5,7 @@ OPUS="opus-1.3.1" NCORES=$(nproc) # install required packages -pkgs='alsamixergui build-essential qt5-qmake qtdeclarative5-dev qttools5-dev-tools libjack-jackd2-dev libasound2-dev cmake libglib2.0-dev' +pkgs='alsamixergui build-essential qt5-qmake qtdeclarative5-dev qttools5-dev-tools 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 From dae7b7d147e031cf96dc7163ea32d0549300d498 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Wed, 26 Jan 2022 16:59:08 +0100 Subject: [PATCH 6/6] Make RPi script compatible with both OS 10 and 11 # Conflicts: # distributions/raspijamulus.sh --- distributions/raspijamulus.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/distributions/raspijamulus.sh b/distributions/raspijamulus.sh index e619cbbdfb..a7dd4cd4e5 100755 --- a/distributions/raspijamulus.sh +++ b/distributions/raspijamulus.sh @@ -5,12 +5,16 @@ OPUS="opus-1.3.1" NCORES=$(nproc) # install required packages -pkgs='alsamixergui build-essential qt5-qmake qtdeclarative5-dev qttools5-dev-tools libasound2-dev cmake libglib2.0-dev' +pkgs='alsamixergui build-essential qtbase5-dev qttools5-dev-tools 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 if [[ $REPLY =~ ^[Yy]$ ]]; then sudo apt-get install $pkgs -y + # Raspbian 10 needs qt5-default; Raspbian 11 doesn't need or provide it + if ! qtchooser -list-versions | grep -q default; then + sudo apt-get install qt5-default -y + fi fi fi