Merge branch 'cooker-ffmpeg' into cooker

This commit is contained in:
xargon 2022-06-15 20:47:15 +02:00
commit 98658cb97a
2 changed files with 18 additions and 17 deletions

View file

@ -38,8 +38,8 @@ jobs:
git submodule init git submodule init
git submodule update git submodule update
sudo apt install -y flatpak flatpak-builder p7zip-full sudo apt install -y flatpak flatpak-builder p7zip-full
flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo 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 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} # for main remember to change ${HOME} into ${GITHUB_WORKSPACE}
- name: Build flatpak - name: Build flatpak

View file

@ -5,6 +5,7 @@ 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
@ -150,21 +151,21 @@ modules:
# ES-DE - START # ES-DE - START
# https://gitlab.com/es-de/emulationstation-de # https://gitlab.com/es-de/emulationstation-de
- 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