From 963f006f38ad07cb9242dbd488e264f18a050ee5 Mon Sep 17 00:00:00 2001 From: askmeaboutloom Date: Mon, 18 Dec 2023 07:49:46 +0100 Subject: [PATCH] WIP: AppImage audio --- .github/actions/restore-linux/action.yml | 5 +++-- .github/workflows/main.yml | 4 +++- cmake/DrawpileDistBuild.cmake | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/actions/restore-linux/action.yml b/.github/actions/restore-linux/action.yml index 5922ea4578..178a1883b0 100644 --- a/.github/actions/restore-linux/action.yml +++ b/.github/actions/restore-linux/action.yml @@ -33,8 +33,9 @@ runs: pushd .github/linuxdeploy-bin >/dev/null && curl -L --remote-name-all https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage - https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage && - chmod u+x linuxdeploy-x86_64.AppImage linuxdeploy-plugin-qt-x86_64.AppImage && + https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage + https://github.com/linuxdeploy/linuxdeploy-plugin-gstreamer/raw/12e0e983f9e01f4e450ef2534cfec10e8aab2539/linuxdeploy-plugin-gstreamer.sh && + chmod u+x linuxdeploy-x86_64.AppImage linuxdeploy-plugin-qt-x86_64.AppImage linuxdeploy-plugin-gstreamer.sh && popd >/dev/null shell: bash if: steps.cache.outputs.cache-hit != 'true' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 52a4dfe8ed..f10821d297 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -86,7 +86,9 @@ jobs: libxcb-util-dev libinput-dev libvulkan-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev libclang-12-dev libasound2-dev libpulse-dev libcups2-dev libssl-dev - libfontconfig1-dev && + libfontconfig1-dev libgstreamer-plugins-base1.0-dev + libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev + libgstreamer-plugins-bad1.0-dev && echo "Clang_ROOT=/usr/lib/llvm-12" >> $GITHUB_ENV other_pre_build: > sudo apt-get update && diff --git a/cmake/DrawpileDistBuild.cmake b/cmake/DrawpileDistBuild.cmake index 7474f94a5e..f50ba0775c 100644 --- a/cmake/DrawpileDistBuild.cmake +++ b/cmake/DrawpileDistBuild.cmake @@ -49,7 +49,7 @@ elseif(WIN32) install(FILES ${extra_libs} DESTINATION ${CMAKE_INSTALL_BINDIR}) else() set(helper_name linuxdeploy-x86_64.AppImage) - set(helper_flags "--plugin;qt;--output;appimage") + set(helper_flags "--plugin;qt--plugin;gstreamer;--output;appimage") set(path_flags "--appdir") set(extra_exe_flag "--executable=") set(app_path "")