From 23c689f07f856aa5f20ba76656f9f709ca19853e Mon Sep 17 00:00:00 2001 From: jofemodo Date: Tue, 20 Feb 2024 19:42:57 +0100 Subject: [PATCH] Fix aeolus install recipe (riban's version).. --- scripts/recipes/install_aeolus.sh | 90 ++++--------------- scripts/recipes/install_aeolus_kokki.sh | 83 +++++++++++++++++ ...setup_system_raspioslite_64bit_bullseye.sh | 3 +- 3 files changed, 101 insertions(+), 75 deletions(-) create mode 100755 scripts/recipes/install_aeolus_kokki.sh diff --git a/scripts/recipes/install_aeolus.sh b/scripts/recipes/install_aeolus.sh index 9218a0e..3590334 100755 --- a/scripts/recipes/install_aeolus.sh +++ b/scripts/recipes/install_aeolus.sh @@ -1,71 +1,16 @@ #!/bin/bash +#Aeolus Pipe Organ Emulator + cd $ZYNTHIAN_SW_DIR #Delete legacy build if it exists if [ -d "kokkinizita" ]; then rm -rf kokkinizita fi - -mkdir kokkinizita -cd kokkinizita - -#ALSA PCMI library -package_name="zita-alsa-pcmi-0.6.1" -wget https://kokkinizita.linuxaudio.org/linuxaudio/downloads/$package_name.tar.bz2 -tar -xf $package_name.tar.bz2 -rm -f $package_name.tar.bz2 -cd $package_name/source -sed -i 's/SUFFIX/#SUFFIX/g' Makefile -sed -i 's/#SUFFIX)/)/' Makefile -sed -i 's/DESTDIR/NONEDIR/g' Makefile -make -j 4 -make install -cd ../.. - -#CLThreads library -package_name="clthreads-2.4.2" -wget https://kokkinizita.linuxaudio.org/linuxaudio/downloads/$package_name.tar.bz2 -tar -xf $package_name.tar.bz2 -rm -f $package_name.tar.bz2 -cd $package_name/source -sed -i 's/SUFFIX/#SUFFIX/g' Makefile -sed -i 's/#SUFFIX)/)/' Makefile -sed -i 's/DESTDIR/NONEDIR/g' Makefile -make -j 4 -make install -cd ../.. - -#CLXClient library -package_name="clxclient-3.9.2" -wget https://kokkinizita.linuxaudio.org/linuxaudio/downloads/$package_name.tar.bz2 -tar -xf $package_name.tar.bz2 -rm -f $package_name.tar.bz2 -cd $package_name/source -sed -i 's/SUFFIX/#SUFFIX/g' Makefile -sed -i 's/#SUFFIX)/)/' Makefile -sed -i 's/DESTDIR/NONEDIR/g' Makefile -sed -i 's/pkgconf/pkg-config/g' Makefile -sed -i 's/PCONFCFL)/PCONFCFL) -I ./' Makefile -make -j 4 -make install -cd ../.. - -#Aeolus Pipe Organ Emulator - -#package_name="aeolus-0.10.4" -#wget https://kokkinizita.linuxaudio.org/linuxaudio/downloads/$package_name.tar.bz2 -#tar -xf $package_name.tar.bz2 -#rm -f $package_name.tar.bz2 -#cd $package_name/source -#sed -i 's/SUFFIX/#SUFFIX/g' Makefile -#sed -i 's/#SUFFIX)/)/' Makefile -#sed -i 's/DESTDIR/NONEDIR/g' Makefile -#sed -i 's/pkgconf/pkg-config/g' Makefile -#Dirty patch to solve "buster bug" -#sed -i "s/10000/20000/" tiface.cc -#make -j 4 -#make install +if [ -d "aeolus" ]; then + rm -rf aeolus +fi if [ ! -d "aeolus" ]; then git clone https://github.com/riban-bw/aeolus.git @@ -75,19 +20,16 @@ git checkout zynthian git pull make -j 3 make install -cd ../.. +make clean + +#Copy stops configurations +cd .. +if [ ! -d "/usr/local/share/aeolus" ]; then + mkdir "/usr/local/share/aeolus" +fi +cp -a stops "/usr/local/share/aeolus" -#Aeolus Stops Configuration -package_name="stops-0.4.0" -wget https://kokkinizita.linuxaudio.org/linuxaudio/downloads/$package_name.tar.bz2 -tar -xf $package_name.tar.bz2 -rm -f $package_name.tar.bz2 -cd $package_name -mkdir "/usr/share/aeolus" -mkdir "/usr/share/aeolus/stops" -cp -rf * "/usr/share/aeolus/stops" -cd ../.. +# Create global configuration file +echo "-u -S /usr/local/share/aeolus/stops" > /etc/aeolus.conf -#Create link to binary and global configuration file -ln -s /usr/local/bin/aeolus /usr/bin/aeolus -echo "-u -J -S /usr/share/aeolus/stops" > /etc/aeolus.conf +cd .. diff --git a/scripts/recipes/install_aeolus_kokki.sh b/scripts/recipes/install_aeolus_kokki.sh new file mode 100755 index 0000000..59c4efa --- /dev/null +++ b/scripts/recipes/install_aeolus_kokki.sh @@ -0,0 +1,83 @@ +#!/bin/bash + +cd $ZYNTHIAN_SW_DIR + +#Delete legacy build if it exists +if [ -d "kokkinizita" ]; then + rm -rf kokkinizita +fi + +mkdir kokkinizita +cd kokkinizita + +#ALSA PCMI library +package_name="zita-alsa-pcmi-0.6.1" +wget https://kokkinizita.linuxaudio.org/linuxaudio/downloads/$package_name.tar.bz2 +tar -xf $package_name.tar.bz2 +rm -f $package_name.tar.bz2 +cd $package_name/source +sed -i 's/SUFFIX/#SUFFIX/g' Makefile +sed -i 's/#SUFFIX)/)/' Makefile +sed -i 's/DESTDIR/NONEDIR/g' Makefile +make -j 4 +make install +cd ../.. + +#CLThreads library +package_name="clthreads-2.4.2" +wget https://kokkinizita.linuxaudio.org/linuxaudio/downloads/$package_name.tar.bz2 +tar -xf $package_name.tar.bz2 +rm -f $package_name.tar.bz2 +cd $package_name/source +sed -i 's/SUFFIX/#SUFFIX/g' Makefile +sed -i 's/#SUFFIX)/)/' Makefile +sed -i 's/DESTDIR/NONEDIR/g' Makefile +make -j 4 +make install +cd ../.. + +#CLXClient library +package_name="clxclient-3.9.2" +wget https://kokkinizita.linuxaudio.org/linuxaudio/downloads/$package_name.tar.bz2 +tar -xf $package_name.tar.bz2 +rm -f $package_name.tar.bz2 +cd $package_name/source +sed -i 's/SUFFIX/#SUFFIX/g' Makefile +sed -i 's/#SUFFIX)/)/' Makefile +sed -i 's/DESTDIR/NONEDIR/g' Makefile +sed -i 's/pkgconf/pkg-config/g' Makefile +sed -i 's/PCONFCFL)/PCONFCFL) -I ./' Makefile +make -j 4 +make install +cd ../.. + +#Aeolus Pipe Organ Emulator + +package_name="aeolus-0.10.4" +wget https://kokkinizita.linuxaudio.org/linuxaudio/downloads/$package_name.tar.bz2 +tar -xf $package_name.tar.bz2 +rm -f $package_name.tar.bz2 +cd $package_name/source +sed -i 's/SUFFIX/#SUFFIX/g' Makefile +sed -i 's/#SUFFIX)/)/' Makefile +sed -i 's/DESTDIR/NONEDIR/g' Makefile +sed -i 's/pkgconf/pkg-config/g' Makefile +#Dirty patch to solve "buster bug" +sed -i "s/10000/20000/" tiface.cc +make -j 4 +make install + +#Aeolus Stops Configuration +package_name="stops-0.4.0" +wget https://kokkinizita.linuxaudio.org/linuxaudio/downloads/$package_name.tar.bz2 +tar -xf $package_name.tar.bz2 +rm -f $package_name.tar.bz2 +cd $package_name +mkdir "/usr/share/aeolus" +mkdir "/usr/share/aeolus/stops" +cp -rf * "/usr/share/aeolus/stops" +cd ../.. + +#Create link to binary and global configuration file +ln -s /usr/local/bin/aeolus /usr/bin/aeolus +echo "-u -J -S /usr/share/aeolus/stops" > /etc/aeolus.conf diff --git a/scripts/setup_system_raspioslite_64bit_bullseye.sh b/scripts/setup_system_raspioslite_64bit_bullseye.sh index 28f177d..f5d6ee8 100755 --- a/scripts/setup_system_raspioslite_64bit_bullseye.sh +++ b/scripts/setup_system_raspioslite_64bit_bullseye.sh @@ -130,7 +130,8 @@ libzita-resampler-dev fonts-roboto libxcursor-dev libxinerama-dev mesa-common-de libfreetype6-dev libswscale-dev qtbase5-dev qtdeclarative5-dev libcanberra-gtk-module '^libxcb.*-dev' \ libcanberra-gtk3-module libxcb-cursor-dev libgtk-3-dev libxcb-util0-dev libxcb-keysyms1-dev libxcb-xkb-dev \ libxkbcommon-x11-dev libssl-dev libmpg123-0 libmp3lame0 libqt5svg5-dev libxrender-dev librubberband-dev \ -libavcodec58 libavformat58 libavutil56 libavresample4 libavformat-dev libavcodec-dev +libavcodec58 libavformat58 libavutil56 libavresample4 libavformat-dev libavcodec-dev \ +libclthreads-dev libclxclient-dev # Tools apt-get -y --no-install-recommends install build-essential git swig pkg-config autoconf automake premake \