update flatpak

FayeSpica · Jun 3, 2024 · e79ecec · e79ecec
1 parent 9d492f1
commit e79ecec
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 70 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -11,7 +11,7 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
           python-version: '3.9.13'
@@ -30,37 +30,15 @@ jobs:
           name: chiaki-borealis
           path: |
             ChiakiBorealis
-  linux-x64:
+  build-flatpak:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        shell: alpine.sh --root {0}
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:kde-5.15
+      options: --privileged
     steps:
-      - uses: actions/checkout@v3
-      - uses: jirutka/setup-alpine@v1
+      - uses: actions/checkout@v4
         with:
-          packages: >
-            build-base
-            git
-            cmake
-            ninja
-            protoc
-            py3-protobuf
-            py3-setuptools
-            opus-dev
-            ffmpeg-dev
-            sdl2-dev
-            gcc 
-            g++ 
-            openssl-dev 
-            glfw-dev 
-            glm-dev
-      - name: alpine-build-chiaki
-        run: |
-          ./scripts/github-alpine-build.sh
-      - name: Artifacts
-        uses: actions/upload-artifact@v4
+          submodules: recursive
+      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
-          name: chiaki-borealis
-          path: |
-            ChiakiBorealis
+          manifest-path: scripts/flatpak/com.github.thestr4ng3r.Chiaki.json
diff --git a/scripts/flatpak/com.github.thestr4ng3r.Chiaki.json b/scripts/flatpak/com.github.thestr4ng3r.Chiaki.json
@@ -1,25 +1,25 @@
 {
-    "app-id": "org.flatpak.Chiaki",
+    "app-id": "org.flatpak.Chiaki.Borealis",
     "runtime": "org.kde.Platform",
-    "runtime-version": "5.14",
+    "runtime-version": "5.15",
     "sdk": "org.kde.Sdk",
-    "command": "chiaki",
-    "rename-icon": "chiaki",
-    "rename-desktop-file": "chiaki.desktop",
+    "command": "chiaki-borealis",
+    "rename-icon": "chiaki-borealis",
+    "rename-desktop-file": "chiaki-borealis.desktop",
     "separate-locales": false,
     "finish-args": [
-	"--share=network",
+        "--share=network",
         "--share=ipc",
-	"--socket=wayland",
-	"--socket=x11",
+        "--socket=wayland",
+        "--socket=x11",
         "--device=all",
         "--device=dri",
         "--allow=bluetooth",
-	"--socket=pulseaudio",
-	"--filesystem=home",
-	"--own-name=org.kde.*",
-	"--env=DBUS_FATAL_WARNINGS=0",
-	"--talk-name=org.freedesktop.ScreenSaver"
+        "--socket=pulseaudio",
+        "--filesystem=home",
+        "--own-name=org.kde.*",
+        "--env=DBUS_FATAL_WARNINGS=0",
+        "--talk-name=org.freedesktop.ScreenSaver"
     ],
     "add-extensions": {
         "org.freedesktop.Platform.ffmpeg-full": {
@@ -29,11 +29,11 @@
             "autodownload": true,
             "autodelete": false
         },
-	"org.freedesktop.Platform.VAAPI.Intel": {
+        "org.freedesktop.Platform.VAAPI.Intel": {
             "directory": "lib/intel-vaapi-driver",
-	    "add-ld-path": "lib",
-	    "version": "19.08"
-	}
+            "add-ld-path": "lib",
+            "version": "19.08"
+        }
     },
     "modules": [
         {
@@ -46,14 +46,18 @@
                 {
                     "type": "archive",
                     "url": "https://github.com/protocolbuffers/protobuf/releases/download/v3.12.0/protoc-3.12.0-linux-x86_64.zip",
-		    "sha256": "3af5f90ad973c36bdaf5c4bd0082cfdc8881593ddf530fc6aa1442ee3d7a4e4b"
+                    "sha256": "3af5f90ad973c36bdaf5c4bd0082cfdc8881593ddf530fc6aa1442ee3d7a4e4b"
                 }
             ]
         },
-	{
-              "name": "ffmpeg",
-              "cleanup": [ "/include", "/lib/pkgconfig", "/share/ffmpeg/examples" ],
-              "config-opts": [
+        {
+            "name": "ffmpeg",
+            "cleanup": [
+                "/include",
+                "/lib/pkgconfig",
+                "/share/ffmpeg/examples"
+            ],
+            "config-opts": [
                 "--enable-shared",
                 "--disable-static",
                 "--enable-gnutls",
@@ -62,37 +66,37 @@
                 "--disable-encoders",
                 "--disable-muxers",
                 "--enable-encoder=png"
-              ],
-              "sources": [{
-                "type": "archive",
-                "url": "https://ffmpeg.org/releases/ffmpeg-4.2.2.tar.xz",
-                "sha256": "cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c"
-              }]
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://ffmpeg.org/releases/ffmpeg-4.2.2.tar.xz",
+                    "sha256": "cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c"
+                }
+            ]
         },
         {
             "name": "pip-install",
             "buildsystem": "simple",
-	    "build-options": {
-              "build-args": [
-                "--share=network"
-              ]
+            "build-options": {
+                "build-args": [
+                    "--share=network"
+                ]
             },
             "build-commands": [
                 "pip3 install --prefix=/app google&&pip3 install --prefix=/app protobuf"
             ]
         },
         {
-            "name": "chiaki",
+            "name": "chiaki-borealis",
             "buildsystem": "cmake",
             "builddir": "true",
             "sources": [
                 {
-                    "type": "git",
-                    "url": "https://git.sr.ht/~thestr4ng3r/chiaki",
-		    "tag": "v2.1.1",
-		    "commit": "2257030adeb5c5a84380c78d34be4d783971663c"
+                    "type": "dir",
+                    "path": "."
                 }
             ]
         }
     ]
-}
+}
diff --git a/scripts/github-alpine-build.sh b/scripts/github-alpine-build.sh
@@ -2,7 +2,7 @@
 
 set -xe
 
-apk add git cmake ninja protoc py3-protobuf py3-setuptools opus-dev ffmpeg-dev sdl2-dev gcc g++ openssl-dev glfw-dev glm-dev
+apk add git cmake ninja protoc py3-protobuf py3-setuptools opus-dev ffmpeg-dev sdl2-dev gcc g++ openssl-dev glfw-dev glm-dev podman fuse udev argp-standalone
 
 rm -rf build
 

diff --git a/scripts/github-ubuntu-build.sh b/scripts/github-ubuntu-build.sh
@@ -0,0 +1,8 @@
+
+
+sudo apt install flatpak flatpak-builder
+
+flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+
+flatpak install -y flathub org.kde.Platform//5.14
+flatpak install -y flathub org.kde.Sdk//5.14
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     set -xe
-    apk add git cmake ninja protoc py3-protobuf py3-setuptools opus-dev ffmpeg-dev sdl2-dev gcc g++ openssl-dev glfw-dev glm-dev
+    apk add git cmake ninja protoc py3-protobuf py3-setuptools opus-dev ffmpeg-dev sdl2-dev gcc g++ openssl-dev glfw-dev glm-dev podman fuse udev argp-standalone
     rm -rf build
@@ Expand Down @@