Merge branch 'master' of https://github.com/muse-sequencer/muse

muse-sequencer · Jan 25, 2021 · 25ca4f3 · 25ca4f3
2 parents a651036 + 3cb14ed
commit 25ca4f3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/.github/workflows/appimage_latest.yml b/.github/workflows/appimage_latest.yml
@@ -24,14 +24,19 @@ jobs:
         sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-xenial
         sudo apt-get update
         sudo apt-get install libsndfile1-dev libsamplerate0-dev libjack-jackd2-dev ladspa-sdk liblo-dev dssi-dev \
-          libsamplerate0-dev libsndfile1-dev libfluidsynth-dev libgtkmm-2.4-dev librtaudio-dev \
+          libsamplerate0-dev libsndfile1-dev libfluidsynth-dev libgtkmm-2.4-dev \
           libinstpatch-dev liblash-compat-dev librubberband-dev python3-dev
+        # librtaudio-dev
         # liblilv-dev lv2-dev liblrdf0-dev
         # sudo apt-get install qt5-default qttools5-dev qttools5-dev-tools libqt5svg5-dev
         sudo apt-get install mesa-common-dev libglu1-mesa-dev
         sudo apt-get install qt515base qt515tools qt515svg
         
         sudo apt-get remove libsord-0-0 libserd-0-0
+        
+        wget http://mirrors.kernel.org/ubuntu/pool/universe/r/rtaudio/librtaudio6_5.0.0~ds-2_amd64.deb
+        wget http://mirrors.kernel.org/ubuntu/pool/universe/r/rtaudio/librtaudio-dev_5.0.0~ds-2_amd64.deb 
+        sudo apt-get install ./librtaudio6_5.0.0~ds-2_amd64.deb ./librtaudio-dev_5.0.0~ds-2_amd64.deb 
                       
     - name: Build lv2
       run: |     

diff --git a/.github/workflows/appimage_release.yml b/.github/workflows/appimage_release.yml
@@ -30,14 +30,19 @@ jobs:
         sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-xenial
         sudo apt-get update
         sudo apt-get install libsndfile1-dev libsamplerate0-dev libjack-jackd2-dev ladspa-sdk liblo-dev dssi-dev \
-          libsamplerate0-dev libsndfile1-dev libfluidsynth-dev libgtkmm-2.4-dev librtaudio-dev \
+          libsamplerate0-dev libsndfile1-dev libfluidsynth-dev libgtkmm-2.4-dev \
           libinstpatch-dev liblash-compat-dev librubberband-dev python3-dev
+        # librtaudio-dev
         # liblilv-dev lv2-dev liblrdf0-dev
         # sudo apt-get install qt5-default qttools5-dev qttools5-dev-tools libqt5svg5-dev
         sudo apt-get install mesa-common-dev libglu1-mesa-dev
         sudo apt-get install qt515base qt515tools qt515svg
         
         sudo apt-get remove libsord-0-0 libserd-0-0
+        
+        wget http://mirrors.kernel.org/ubuntu/pool/universe/r/rtaudio/librtaudio6_5.0.0~ds-2_amd64.deb
+        wget http://mirrors.kernel.org/ubuntu/pool/universe/r/rtaudio/librtaudio-dev_5.0.0~ds-2_amd64.deb 
+        sudo apt-get install ./librtaudio6_5.0.0~ds-2_amd64.deb ./librtaudio-dev_5.0.0~ds-2_amd64.deb 
                       
     - name: Build lv2
       run: |     

diff --git a/.github/workflows/compatibility_build.yml b/.github/workflows/compatibility_build.yml
@@ -20,15 +20,16 @@ jobs:
         sudo add-apt-repository ppa:beineri/opt-qt571-xenial
         sudo apt-get update
         sudo apt-get install libsndfile1-dev libsamplerate0-dev libjack-jackd2-dev ladspa-sdk liblo-dev dssi-dev \
-          libsamplerate0-dev libsndfile1-dev libfluidsynth-dev libgtkmm-2.4-dev librtaudio-dev \
+          libsamplerate0-dev libsndfile1-dev libfluidsynth-dev libgtkmm-2.4-dev \
           libinstpatch-dev liblash-compat-dev librubberband-dev python3-dev \
           liblilv-dev lv2-dev liblrdf0-dev
-        # sudo apt-get install qt5-default qttools5-dev qttools5-dev-tools libqt5svg5-dev
         sudo apt-get install mesa-common-dev libglu1-mesa-dev
         sudo apt-get install qt57base qt57tools qt57svg
+               
+        wget http://mirrors.kernel.org/ubuntu/pool/universe/r/rtaudio/librtaudio6_5.0.0~ds-2_amd64.deb
+        wget http://mirrors.kernel.org/ubuntu/pool/universe/r/rtaudio/librtaudio-dev_5.0.0~ds-2_amd64.deb 
+        sudo apt-get install ./librtaudio6_5.0.0~ds-2_amd64.deb ./librtaudio-dev_5.0.0~ds-2_amd64.deb 
         
-        sudo apt-get remove libsord-0-0 libserd-0-0
-                              
     - name: Check Qt Installation
       run: |
         #cat /opt/qt57/bin/qt57-env.sh
@@ -44,6 +45,10 @@ jobs:
         echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV
         echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $GITHUB_ENV
         
+        echo $PKG_CONFIG_PATH
+        pkg-config --variable pc_path pkg-config
+        ls /usr/lib/x86_64-linux-gnu/pkgconfig
+        
     - name: Create Build Environment
       run: cmake -E make_directory ${{runner.workspace}}/build