From 8fe1e7d73a9de2ea8cd7b1b12e27eeae35278f80 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Sun, 22 Jun 2025 05:29:10 -0700 Subject: [PATCH] fix(carla): Update build deps (#5605) (#5607) * fix(carla): Try BuildConflicts * fix: Try a ci_setup script * fix: Does this need to be DNF5 explicitly? * Okay just don't use that flag * Try fixing the typo maybe * Considering the stuff this wants to remove I don't think this is safe but * I wanna try something first * ? * fix: Apparently this needs full FFmpeg and wants SDL? * fix: Search by CMake? * Delete anda/multimedia/carla/ci_setup.rhai --------- (cherry picked from commit d8bf13e53e7d8f8a2dd1c10deceb7c1e17f44475) Signed-off-by: Gilver Co-authored-by: Gilver --- anda/multimedia/carla/Carla-nightly.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/anda/multimedia/carla/Carla-nightly.spec b/anda/multimedia/carla/Carla-nightly.spec index b3b107be00..be7faebda1 100644 --- a/anda/multimedia/carla/Carla-nightly.spec +++ b/anda/multimedia/carla/Carla-nightly.spec @@ -79,12 +79,14 @@ BuildRequires: pkgconfig(mxml) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(Qt5Core) BuildRequires: python3-qt5-base -BuildRequires: python3-magic +BuildRequires: python3-file-magic BuildRequires: python3-rdflib BuildRequires: pkgconfig(liblo) BuildRequires: pkgconfig(zlib) Buildrequires: pkgconfig(libmagic) -BuildRequires: (ffmpeg-free-devel or ffmpeg-devel) +BuildRequires: cmake(SDL2) +BuildRequires: cmake(SDL3) +BuildRequires: ffmpeg-devel BuildRequires: desktop-file-utils BuildRequires: make BuildRequires: /usr/bin/appstream-util