Removed flatpak ffmpeg and restored the self built one as as it's not working

This commit is contained in:
xargon 2022-06-16 11:59:57 +02:00
parent 7b20d0d842
commit b38e5b1784

View file

@ -5,7 +5,6 @@ sdk: org.kde.Sdk
# Needed for rpcs3 # Needed for rpcs3
sdk-extensions: sdk-extensions:
- org.freedesktop.Sdk.Extension.llvm13 - org.freedesktop.Sdk.Extension.llvm13
- org.freedesktop.Platform.ffmpeg-full
# /Needed for rpcs3 # /Needed for rpcs3
# Needed for Yuzu # Needed for Yuzu
base: io.qt.qtwebengine.BaseApp base: io.qt.qtwebengine.BaseApp
@ -151,22 +150,21 @@ modules:
# ES-DE - START # ES-DE - START
# https://gitlab.com/es-de/emulationstation-de # https://gitlab.com/es-de/emulationstation-de
# Disabled because I'm using the flatpak sdk-extension - name: ffmpeg
# - name: ffmpeg config-opts:
# config-opts: - --disable-static
# - --disable-static - --disable-programs
# - --disable-programs - --disable-doc
# - --disable-doc - --enable-gpl
# - --enable-gpl - --enable-shared
# - --enable-shared - --enable-libvorbis
# - --enable-libvorbis - --enable-libopus
# - --enable-libopus - --enable-libvpx
# - --enable-libvpx - --enable-postproc
# - --enable-postproc sources:
# sources: - type: git
# - type: git url: https://github.com/FFmpeg/FFmpeg.git
# url: https://github.com/FFmpeg/FFmpeg.git tag: n5.0
# tag: n5.0
- name: freeimage - name: freeimage
no-autogen: true no-autogen: true
@ -1002,7 +1000,7 @@ modules:
- name: ppsspp - name: ppsspp
buildsystem: cmake-ninja buildsystem: cmake-ninja
config-opts: config-opts:
- '-DUSE_SYSTEM_FFMPEG=ON' # was off - '-DUSE_SYSTEM_FFMPEG=OFF'
- '-DUSE_SYSTEM_LIBZIP=ON' - '-DUSE_SYSTEM_LIBZIP=ON'
- '-DUSE_SYSTEM_ZSTD=ON' - '-DUSE_SYSTEM_ZSTD=ON'