RPCS3: forced using our built FFMPEG

This commit is contained in:
XargonWan 2023-04-20 12:41:27 +00:00
parent 21b6c79c4e
commit dd6c35352f

View file

@ -8,13 +8,13 @@ sdk-extensions:
#- org.freedesktop.Sdk.Extension.dotnet6 # Needed for Ryujinx - Removed, check if it's not breaking something else #- org.freedesktop.Sdk.Extension.dotnet6 # Needed for Ryujinx - Removed, check if it's not breaking something else
base: io.qt.qtwebengine.BaseApp # Needed for Yuzu base: io.qt.qtwebengine.BaseApp # Needed for Yuzu
base-version: 5.15-22.08 # Needed for Yuzu base-version: 5.15-22.08 # Needed for Yuzu
add-extensions: # add-extensions:
org.freedesktop.Platform.ffmpeg-full: # org.freedesktop.Platform.ffmpeg-full:
directory: lib/ffmpeg # directory: lib/ffmpeg
add-ld-path: . # add-ld-path: .
version: '22.08' # version: '22.08'
autodownload: true # autodownload: true
autodelete: false # autodelete: false
command: retrodeck.sh command: retrodeck.sh
finish-args: finish-args:
@ -226,21 +226,21 @@ modules:
# https://gitlab.com/es-de/emulationstation-de # https://gitlab.com/es-de/emulationstation-de
#This is disabled because we added the extension (line 11), check if the videos are ok. #This is disabled because we added the extension (line 11), check if the videos are ok.
# - 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.1.1 tag: n5.1.1
- name: freeimage - name: freeimage
no-autogen: true no-autogen: true
@ -826,7 +826,8 @@ modules:
- -DUSE_NATIVE_INSTRUCTIONS=OFF - -DUSE_NATIVE_INSTRUCTIONS=OFF
- -DUSE_PRECOMPILED_HEADERS=OFF - -DUSE_PRECOMPILED_HEADERS=OFF
- -DUSE_SYSTEM_CURL=ON - -DUSE_SYSTEM_CURL=ON
- -DUSE_SYSTEM_FFMPEG=ON # Disabled this to force RPCS3 to use our built FFMPEG
- -DUSE_SYSTEM_FFMPEG=OFF
- -DUSE_SYSTEM_LIBPNG=ON - -DUSE_SYSTEM_LIBPNG=ON
- -DUSE_SYSTEM_ZLIB=ON - -DUSE_SYSTEM_ZLIB=ON
- -DITTAPI_SOURCE_DIR=/run/build/rpcs3/ittapi - -DITTAPI_SOURCE_DIR=/run/build/rpcs3/ittapi