From 0a585138c2fd95fdb1cd08b14584bfa69753221a Mon Sep 17 00:00:00 2001 From: xargon Date: Thu, 16 Jun 2022 11:59:57 +0200 Subject: [PATCH] Removed flatpak ffmpeg and restored the self built one as as it's not working --- net.retrodeck.retrodeck.yml | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index fb104d00..9de54d1e 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -5,7 +5,6 @@ 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 @@ -151,22 +150,21 @@ modules: # ES-DE - START # https://gitlab.com/es-de/emulationstation-de - # Disabled because I'm using the flatpak sdk-extension - # - 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 @@ -1002,7 +1000,7 @@ modules: - name: ppsspp buildsystem: cmake-ninja config-opts: - - '-DUSE_SYSTEM_FFMPEG=ON' # was off + - '-DUSE_SYSTEM_FFMPEG=OFF' - '-DUSE_SYSTEM_LIBZIP=ON' - '-DUSE_SYSTEM_ZSTD=ON'