From ac8b74cb4d190de27fbad40cc4bad1edb8b3439d Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 12 May 2025 07:35:14 -0500 Subject: [PATCH] fix(ffmpeg): Track vvenc-libs for rebuilds, workaround for GCC15 update (#4768) * Create VERSION_vvenc.txt Signed-off-by: Gilver * feat: Track vvenc-libs Signed-off-by: Gilver * More ifcond workarounds I LOVE it Signed-off-by: Gilver * Yikes Signed-off-by: Gilver * chore: Add a changelog section so GitHub hopefully stops DOING THAT Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/multimedia/ffmpeg/VERSION_vvenc.txt | 1 + anda/multimedia/ffmpeg/ffmpeg.spec | 11 ++++++++++- anda/multimedia/ffmpeg/update.rhai | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 anda/multimedia/ffmpeg/VERSION_vvenc.txt diff --git a/anda/multimedia/ffmpeg/VERSION_vvenc.txt b/anda/multimedia/ffmpeg/VERSION_vvenc.txt new file mode 100644 index 0000000000..b50dd27dd9 --- /dev/null +++ b/anda/multimedia/ffmpeg/VERSION_vvenc.txt @@ -0,0 +1 @@ +1.13.1 diff --git a/anda/multimedia/ffmpeg/ffmpeg.spec b/anda/multimedia/ffmpeg/ffmpeg.spec index ec454e8769..4684b078de 100644 --- a/anda/multimedia/ffmpeg/ffmpeg.spec +++ b/anda/multimedia/ffmpeg/ffmpeg.spec @@ -400,6 +400,12 @@ This subpackage contains the headers for FFmpeg libswscale. #sed -i -e 's|#!/bin/sh|#!/bin/sh -x|g' configure %build +# Work around a new GCC15 change until FFmpeg updates for it +%if 0%{?fedora} >= 42 +%if "%{version}" <= "7.1.1" +export CFLAGS="%{optflags} -Wno-incompatible-pointer-types" +%endif +%endif %set_build_flags ./configure \ @@ -662,4 +668,7 @@ mv doc/*.html doc/html %{_includedir}/libswscale %{_libdir}/pkgconfig/libswscale.pc %{_libdir}/libswscale.so -%{_mandir}/man3/libswscale.3* \ No newline at end of file +%{_mandir}/man3/libswscale.3* + +%changelog +%autochangelog diff --git a/anda/multimedia/ffmpeg/update.rhai b/anda/multimedia/ffmpeg/update.rhai index 69e2e89df5..8685673ed6 100644 --- a/anda/multimedia/ffmpeg/update.rhai +++ b/anda/multimedia/ffmpeg/update.rhai @@ -12,3 +12,6 @@ open_file("anda/multimedia/ffmpeg/VERSION_x265.txt", "w").write(ffmpeg_ver); let tesseract_ver = bump::bodhi("tesseract", bump::as_bodhi_ver(labels.branch)); open_file("anda/multimedia/ffmpeg/VERSION_tesseract.txt", "w").write(tesseract_ver); + +let vvenc_ver = get(`https://madoguchi.fyralabs.com/v4/terra${branch}/packages/vvenc-libs`).json().ver; +open_file("anda/multimedia/ffmpeg/VERSION_vvenc.txt", "w").write(vvenc_ver);