Merge branch 'packaging/flatpak' into 'main'

packaging: Add support for building a Flatpak

See merge request then-try-this/samplebrain!4

.gitlab-ci.yml

@@ -18,29 +18,29 @@
 
 # see also https://docs.gitlab.com/ee/ci/runners/saas/macos_saas_runner.html
 
-# .macos_saas_runners:
-#   tags:
-#     - shared-macos-amd64
-#   image: macos-11-xcode-12
+.macos_saas_runners:
+  tags:
+    - shared-macos-amd64
+  image: macos-11-xcode-12
 
-# stages:
-#   - build
-#   - test
+stages:
+  - build
+  - test
 
-# before_script:
-#   - echo "started by ${GITLAB_USER_NAME}"
+before_script:
+  - echo "started by ${GITLAB_USER_NAME}"
 
-# build:
-#   extends:
-#     - .macos_saas_runners
-#   stage: build
-#   script:
-#     - echo "running scripts in the build job"
+build:
+  extends:
+    - .macos_saas_runners
+  stage: build
+  script:
+    - echo "running scripts in the build job"
 
-# test:
-#   extends:
-#     - .macos_saas_runners
-#   stage: test
-#   script:
-#     - echo "running scripts in the test job"
+test:
+  extends:
+    - .macos_saas_runners
+  stage: test
+  script:
+    - echo "running scripts in the test job"
 

README.md

@@ -19,7 +19,7 @@ Quick start:
 1. Load a bunch of samples into the brain
 2. Click (re)generate brain
 3. Load a loop sample into the target
-4. Click (re)generate blocks
+4. Click (re)generate target
 5. Press play
 6. Tweak brain
 
@@ -60,7 +60,7 @@ If you'd like the right font, optionally:
     $ sudo apt install ttf-mscorefonts-installer
     
 # Building from source
-## Linux (Ubuntu)
+
 Install libraries for the sample engine (use brew on mac, MinGW on win):
     
     $ sudo apt install libsndfile1-dev portaudio19-dev liblo-dev libfftw3-dev
@@ -71,28 +71,8 @@ Install dependancies for the interface:
 
 Build & run it:
 
-    $ mkdir build
-    $ cd build
-    $ qmake ..
-    $ make
-    $ sudo make install
-    $ samplebrain
-
-## Mac
-Install libraries for sample engine:
-
-    $ brew install fftw portaudio
-
-Install dependancies for the interface:
-
-    $ brew install qt
-    $ brew link qt
-
-Build & run it:
-
-    $ mkdir build
-    $ cd build
-    $ qmake ..
+    $ cd app
+    $ qmake
     $ make
     $ sudo make install
     $ samplebrain
@@ -101,21 +81,9 @@ Build & run it:
 
 To make a mac app bundle:
     
-Run `macdeployqt` to copy all dependencies inside the app.
-
-Create Mac app bundle:
-
-    $ cd build
-    $ macdeployqt
-
-Copy desktop/samplebrain.icns (the icon) to the Resources directory in the bundle.
-
-    $ cp ../desktop/samplebrain.icns samplebrain.app/Contents/Resources
-
-Edit Info.plist to add samplebrain.icns to CFBundleIconFile. Key `CFBundleIconFile` should match:
-
-	<key>CFBundleIconFile</key>
-	<string>samplebrain.icns</string>
+* Run `macdeployqt` to copy all dependancies inside the app.
+* Copy desktop/samplebrain.icns (the icon) to the Resources directory in the bundle.
+* Edit Info.plist to add samplebrain.icns to CFBundleIconFile.
     
 ## What's here