From a563aa59608a87ccec77bbdf7c04b7bf77a64452 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Fri, 3 Dec 2021 19:10:29 -0700 Subject: [PATCH] manifest: build our own ffmpeg ... ... the one in Flatpak is too broken to be usable in yuzu --- org.yuzu_emu.yuzu.json | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/org.yuzu_emu.yuzu.json b/org.yuzu_emu.yuzu.json index d395248..31fdc81 100644 --- a/org.yuzu_emu.yuzu.json +++ b/org.yuzu_emu.yuzu.json @@ -5,14 +5,6 @@ "sdk": "org.kde.Sdk", "base": "io.qt.qtwebengine.BaseApp", "base-version": "5.15-21.08", - "add-extensions": { - "org.freedesktop.Platform.ffmpeg-full": { - "directory": "lib/ffmpeg", - "version": "21.08", - "add-ld-path": ".", - "no-autodownload": false - } - }, "command": "yuzu", "rename-desktop-file": "yuzu.desktop", "rename-icon": "yuzu", @@ -180,6 +172,24 @@ } ] }, + { + "name": "nv-codec-headers", + "make-install-args": ["PREFIX=/app"], + "no-autogen": true, + "cleanup": ["*"], + "sources": [ + { + "type": "git", + "url": "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git", + "tag": "n11.1.5.0", + "commit": "b641a195edbe3ac9788e681e22c2e2fad8aacddb", + "x-checker-data": { + "type": "git", + "tag-pattern": "^n([\\d.]+)$" + } + } + ] + }, { "name": "yuzu", "buildsystem": "cmake-ninja", @@ -190,6 +200,7 @@ "-DYUZU_ENABLE_COMPATIBILITY_REPORTING=ON", "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON", "-DYUZU_USE_QT_WEB_ENGINE=ON", + "-DYUZU_USE_BUNDLED_FFMPEG=ON", "-DDISPLAY_VERSION=846", "-DBUILD_TAG=mainline-846", "-DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline" @@ -206,7 +217,6 @@ "/share/pixmaps" ], "post-install": [ - "mkdir -p /app/lib/ffmpeg", "install -Dm644 ../org.yuzu_emu.yuzu.metainfo.xml /app/share/appdata/org.yuzu_emu.yuzu.metainfo.xml", "desktop-file-install --dir=/app/share/applications ../dist/yuzu.desktop", "desktop-file-edit --set-key StartupWMClass --set-value yuzu /app/share/applications/yuzu.desktop", @@ -237,4 +247,4 @@ ] } ] -} \ No newline at end of file +}