From 7333d0e5deeb86c2674a31452fc4a293dee8c5de Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 13 Feb 2023 11:42:33 -0500 Subject: [PATCH] o3de: Use Fedora's ffmpeg package and drop rpmfusion note --- README.md | 1 - o3de/o3de.spec | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9f1c4ce..08fca65 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ They are a **huge work in progress**. Most of o3de does not work properly on Lin Please note the following items when diving in here: -- one of the o3de gems depends on ffmpeg, so you will need to have rpmfusion-free configured - some of the dependencies are proprietary (PVRTexTool, Wwise, PhysX, NVCloth). for these, I can distribute spec files and patches, but not the "source", so please don't even ask. I do not have access to the source code and I cannot redistribute their binaries. - Most of o3de does not work properly on Linux. I said this before but it bears repeating. Do not tell me that nothing works right on Fedora, I know. Either send me patches or wait. :) - Most of my patches have not been sent upstream yet. This is because either they are hacks (and I know it), they're messy (and I know it), or I doubt upstream will want to do it (o3de seems really happy with how they handle 3rd party deps). Could also be that I haven't had time. diff --git a/o3de/o3de.spec b/o3de/o3de.spec index 9a71f89..94b001c 100644 --- a/o3de/o3de.spec +++ b/o3de/o3de.spec @@ -155,6 +155,7 @@ BuildRequires: xxhash-devel, alembic-devel, poly2tri-devel BuildRequires: OpenEXR-devel, luxcorerender-devel, libunwind-devel BuildRequires: hdf5-devel, compat-lua-devel >= 5.1.5-19 BuildRequires: libsamplerate-devel +BuildRequires: ffmpeg-free-devel # mcpp is in Fedora, but o3de needs changes which are not (yet) in that mcpp package BuildRequires: mcpp >= 2.7.2-29 BuildRequires: libmcpp-devel >= 2.7.2-29 @@ -193,6 +194,7 @@ BuildRequires: rdfind %if 0%{?system_build} Requires: astc-encoder Requires: DirectXShaderCompiler, o3de-azslc, mcpp, SPIRV-Cross +Requires: ffmpeg-free %endif # We probably need these python modules