From fc485ed2b116c2257cd12c1d8a290b2cecf1c2d3 Mon Sep 17 00:00:00 2001 From: xargon Date: Wed, 15 Jun 2022 10:21:23 +0200 Subject: [PATCH 1/4] MANIFEST: removed ffmpeg and added the flatpak's one --- net.retrodeck.retrodeck.yml | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index f4d2c9ba..67946db7 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -5,6 +5,7 @@ sdk: org.kde.Sdk # Needed for rpcs3 sdk-extensions: - org.freedesktop.Sdk.Extension.llvm13 + - org.freedesktop.Platform.ffmpeg-full # /Needed for rpcs3 # Needed for Yuzu base: io.qt.qtwebengine.BaseApp @@ -148,21 +149,21 @@ modules: # ES-DE - - name: ffmpeg - config-opts: - - --disable-static - - --disable-programs - - --disable-doc - - --enable-gpl - - --enable-shared - - --enable-libvorbis - - --enable-libopus - - --enable-libvpx - - --enable-postproc - sources: - - type: git - url: https://github.com/FFmpeg/FFmpeg.git - tag: n5.0 + # - name: ffmpeg + # config-opts: + # - --disable-static + # - --disable-programs + # - --disable-doc + # - --enable-gpl + # - --enable-shared + # - --enable-libvorbis + # - --enable-libopus + # - --enable-libvpx + # - --enable-postproc + # sources: + # - type: git + # url: https://github.com/FFmpeg/FFmpeg.git + # tag: n5.0 - name: freeimage no-autogen: true From 3f0a68ff58e2adca72b5acfea34b7c5ed90c4ccb Mon Sep 17 00:00:00 2001 From: xargon Date: Wed, 15 Jun 2022 10:59:07 +0200 Subject: [PATCH 2/4] EXPEPERIMENTAL: retroarch - added ffmpeg to workflow --- .github/workflows/cooker-selfhosted.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 093aa29b..d6268f05 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -39,7 +39,7 @@ jobs: git submodule update sudo apt install -y flatpak flatpak-builder p7zip-full flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13 + flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13 org.freedesktop.Platform.ffmpeg-full # for main remember to change ${HOME} into ${GITHUB_WORKSPACE} - name: Build flatpak From 750d848233458ececf6d0fd4dbec8044f0da978f Mon Sep 17 00:00:00 2001 From: xargon Date: Wed, 15 Jun 2022 14:48:36 +0200 Subject: [PATCH 3/4] EXPEPERIMENTAL: retroarch - added ffmpeg to workflow -fix1 --- .github/workflows/cooker-selfhosted.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index d6268f05..33b8f345 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -39,7 +39,7 @@ jobs: git submodule update sudo apt install -y flatpak flatpak-builder p7zip-full flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13 org.freedesktop.Platform.ffmpeg-full + flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13 org.freedesktop.Platform.ffmpeg-full/x86_64/21.08 # for main remember to change ${HOME} into ${GITHUB_WORKSPACE} - name: Build flatpak From 3425040a300d3295857318867da607c72b9cd37f Mon Sep 17 00:00:00 2001 From: xargon Date: Wed, 15 Jun 2022 19:06:40 +0200 Subject: [PATCH 4/4] WORKFLOW: sudo for flatpak setup --- .github/workflows/cooker-selfhosted.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 33b8f345..79125404 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -38,8 +38,8 @@ jobs: git submodule init git submodule update sudo apt install -y flatpak flatpak-builder p7zip-full - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13 org.freedesktop.Platform.ffmpeg-full/x86_64/21.08 + sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13 org.freedesktop.Platform.ffmpeg-full/x86_64/21.08 # for main remember to change ${HOME} into ${GITHUB_WORKSPACE} - name: Build flatpak