diff --git a/.github/workflows/build-project.yaml b/.github/workflows/build-project.yaml index 0d06e49ef..30fc044fc 100644 --- a/.github/workflows/build-project.yaml +++ b/.github/workflows/build-project.yaml @@ -249,7 +249,7 @@ jobs: env: FLATPAK_BUILD_SHARE_PATH: flatpak_app/files/share container: - image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.8 + image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-24.08 options: --privileged volumes: - /usr/local/lib/android:/to_clean/android diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index e3bd6268c..3189014ca 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -87,7 +87,7 @@ jobs: YOUTUBE_SECRET: ${{ secrets.YOUTUBE_SECRET }} YOUTUBE_SECRET_HASH: ${{ secrets.YOUTUBE_SECRET_HASH }} container: - image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.8 + image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-24.08 options: --privileged volumes: - /usr/local/lib/android:/to_clean/android diff --git a/build-aux/com.obsproject.Studio.json b/build-aux/com.obsproject.Studio.json index 51b23c8f1..b4cdcbe51 100644 --- a/build-aux/com.obsproject.Studio.json +++ b/build-aux/com.obsproject.Studio.json @@ -1,8 +1,8 @@ { "id": "com.obsproject.Studio", - "runtime": "org.kde.Platform", - "runtime-version": "6.8", - "sdk": "org.kde.Sdk", + "runtime": "org.freedesktop.Platform", + "runtime-version": "24.08", + "sdk": "org.freedesktop.Sdk", "command": "obs", "finish-args": [ "--socket=wayland", @@ -86,6 +86,21 @@ } ] }, + { + "name": "qt", + "buildsystem": "simple", + "build-commands": [ + "tar -xvf qt.tar.xz -C /" + ], + "sources": [ + { + "type": "file", + "dest-filename": "qt.tar.xz", + "url": "https://github.com/obsproject/obs-deps-buildstream/releases/download/2025-10-03/flatpak-qt-x86_64-2025-10-03.tar.xz", + "sha256": "79d7377da42e1eea2a18ed76407c1db716a80778fe34ef1f68b9eb7ca6d89cbf" + } + ] + }, { "name": "cef", "build-options": {