.desktop and godot compilation

1 files changed, 46 insertions, 35 deletions

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index f10ac89..31fc238 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -8,21 +8,19 @@ issues: https://codeberg.org/hurrycurry/hurrycurry/issues
 source-code: https://codeberg.org/hurrycurry/hurrycurry
 title: Hurry Curry!
 description: |
-    This is my-snap's description. You have a paragraph or two to tell the
-    most important story about your snap. Keep it under 100 words though,
-    we live in tweetspace and your description wants to look good in the snap
-    store.
+    Hurry Curry! is a multiplayer game about cooking.
+    Your goal is to run a restaurant and gain points by serving meals you've cooked.
 
-grade: devel # must be 'stable' to release into candidate/stable channels
-confinement: devmode # use 'strict' once you have the right plugs and slots
+grade: devel
+confinement: strict
 
 layout:
-  /usr/share/libdrm:
-    bind: $SNAP/usr/share/libdrm
+    /usr/share/libdrm:
+        bind: $SNAP/usr/share/libdrm
 
 apps:
-    bash:
-        command: bin/bash
+    # bash:
+    #     command: bin/bash
     server:
         command: bin/hurrycurry-server --data-dir $SNAP/usr/share/hurrycurry/data
         plugs:
@@ -68,14 +66,36 @@ parts:
     #     stage:
     #         - bin/godot
 
-    godot-editor:
-        plugin: dump
-        source: https://github.com/godotengine/godot/releases/download/4.3-stable/Godot_v4.3-stable_linux.x86_64.zip
-        organize: { "Godot_*": bin/godot }
-        stage: [bin/godot]
-
     godot-runtime:
         plugin: nil
+        source: https://github.com/godotengine/godot/releases/download/4.3-stable/godot-4.3-stable.tar.xz
+        build-packages:
+            - build-essential
+            - libasound2-dev
+            - libgl1-mesa-dev
+            - libglu1-mesa-dev
+            - libpulse-dev
+            - libudev-dev
+            - libx11-dev
+            - libxcursor-dev
+            - libxi-dev
+            - libxinerama-dev
+            - libxrandr-dev
+            - pkg-config
+            - scons
+        override-build: |
+            scons platform=linuxbsd use_lto=yes target=template_release
+        organize: { "bin/godot.*": bin/godot }
+        prime: [bin/godot]
+
+    # godot-editor:
+    #     plugin: dump
+    #     source: https://github.com/godotengine/godot/releases/download/4.3-stable/Godot_v4.3-stable_linux.x86_64.zip
+    #     organize: { "Godot_*": bin/godot }
+    #     stage: [bin/godot]
+
+    godot-runtime-libs:
+        plugin: nil
         stage-packages:
             - libpulse0
             - libudev1
@@ -95,13 +115,13 @@ parts:
         source: https://codeberg.org/hurrycurry/hurrycurry-dist-extra.git
         source-tag: v2.0.0
         parse-info: [org.godotengine.Godot.metainfo.xml]
-        prime: [org.metamuffin.hurrycurry.client.desktop]
+        organize:
+            "org.metamuffin.hurrycurry.client.desktop": "meta/gui/org.metamuffin.hurrycurry.client.desktop"
+        prime: [meta/gui/org.metamuffin.hurrycurry.client.desktop]
 
     client:
         plugin: nil
-        after: 
-            - godot-editor
-            - desktop-glib-only
+        # after: [godot-editor]
         source: https://codeberg.org/hurrycurry/hurrycurry.git
         stage-packages:
             - libglu1-mesa
@@ -134,18 +154,9 @@ parts:
         organize: { "data": usr/share/hurrycurry/data }
         prime: [usr/share/hurrycurry/data]
 
-    bash:
-        plugin: nil
-        override-build: |
-            cp /usr/bin/bash $CRAFT_PART_INSTALL/bash
-        organize: { bash: bin/bash }
-        prime: [bin/bash]
-    
-    desktop-glib-only:
-        source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
-        source-subdir: glib-only
-        plugin: make
-        build-packages:
-        - libglib2.0-dev
-        stage-packages:
-        - libglib2.0-bin
\ No newline at end of file
+    # bash:
+    #     plugin: nil
+    #     override-build: |
+    #         cp /usr/bin/bash $CRAFT_PART_INSTALL/bash
+    #     organize: { bash: bin/bash }
+    #     prime: [bin/bash]