From e6fbb4f146103ae70ac592ea73b46cf182fd655c Mon Sep 17 00:00:00 2001
From: runiq <hey@runiq.de>
Date: Sun, 16 Mar 2025 00:05:57 +0100
Subject: [PATCH] More Flatpak manifest cleanup

The flow should be clearer if every module is structured this way:

1. name
2. sources
3. buildsystem
4. config-opts
5. build-commands
6. post-install
7. cleanup
---
 vu.b4.alsa-scarlett-gui.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/vu.b4.alsa-scarlett-gui.yml b/vu.b4.alsa-scarlett-gui.yml
index e78e2f1..4b9b5de 100644
--- a/vu.b4.alsa-scarlett-gui.yml
+++ b/vu.b4.alsa-scarlett-gui.yml
@@ -56,9 +56,6 @@ modules:
       - /share/runtime
       - /share/sounds
   - name: alsa-scarlett-gui
-    buildsystem: simple
-    build-commands:
-      - make -j8 install PREFIX=$FLATPAK_DEST
     sources:
       - type: dir
         path: ./src
@@ -66,15 +63,18 @@ modules:
       # - type: git
       #   url: https://github.com/geoffreybennett/alsa-scarlett-gui.git
       #   tag: "0.2"
+    buildsystem: simple
+    build-commands:
+      - make -j8 install PREFIX=$FLATPAK_DEST
     cleanup:
       - /lib/debug
       - /lib/source
   - name: scarlett2-firmware
-    buildsystem: simple
-    build-commands:
-      - mkdir -p $FLATPAK_DEST/lib/firmware/scarlett2
-      - cp -a LICENSE.Focusrite firmware/* $FLATPAK_DEST/lib/firmware/scarlett2
     sources:
       - type: archive
         url: https://github.com/geoffreybennett/scarlett2-firmware/archive/refs/tags/2128b.tar.gz
         sha256: 4a17fdbe2110855c2f7f6cfc5ea1894943a6e58770f3dff5ef283961f8ae2a03
+    buildsystem: simple
+    build-commands:
+      - mkdir -p $FLATPAK_DEST/lib/firmware/scarlett2
+      - cp -a LICENSE.Focusrite firmware/* $FLATPAK_DEST/lib/firmware/scarlett2