tribes/guix
1
0
Fork 1
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-01 06:45:55 +02:00
Code Activity

gnu: ffmpeg@6: Fix build with gcc-14 on i686-linux.

Browse Source 
By inheritance this also fixes ffmpeg@5,ffmpeg@4

* gnu/packages/video.scm (ffmpeg): Add a phase to relax gcc-14 for i686.
(ffmpeg-3.4): Remove inherited 'relax-gcc-14-strictness-phase on i686-linux.

Change-Id: I33fd60eea056e3425d6ceac4d4c8d62132e4e46b
Signed-off-by: Andreas Enge <andreas@enge.fr>
This commit is contained in:
Dariqq
2025-07-21 06:25:25 +00:00
committed by Andreas Enge
parent 015ef40a60
commit 47d3129c5c
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gnu/packages/video.scm
+21 -6
View File
@@ -1867,7 +1867,19 @@ audio/video codec library.")
"0s7r2qv8gh2a3w568n9xxgcz0q8j5ww1jdsci1hm9f4l1yqg9146"))
(patches
(search-patches
"ffmpeg-add-av_stream_get_first_dts-for-chromium.patch"))))))
"ffmpeg-add-av_stream_get_first_dts-for-chromium.patch"))))
(arguments
(if (target-x86-32?)
(substitute-keyword-arguments (package-arguments ffmpeg-7)
((#:phases phases)
#~(modify-phases #$phases
(add-before 'configure 'relax-gcc-14-strictness
(lambda _
(setenv
"CFLAGS"
(string-append "-g -O2"
" -Wno-error=incompatible-pointer-types")))))))
(package-arguments ffmpeg-7)))))
(define-public ffmpeg-5
(package
@@ -1936,13 +1948,16 @@ audio/video codec library.")
"--enable-libsvtav1")))
((#:phases phases)
#~(modify-phases #$phases
#$@(if (target-x86-32?)
#~((delete 'relax-gcc-14-strictness))
#~())
(add-after 'configure 'relax-gcc-14-strictness
(lambda _
(substitute* "ffbuild/config.mak"
(("CFLAGS *=" all)
(string-append all
" -Wno-error=incompatible-pointer-types"
" -Wno-error=int-conversion")))))))))
(substitute* "ffbuild/config.mak"
(("CFLAGS *=" all)
(string-append all
" -Wno-error=incompatible-pointer-types"
" -Wno-error=int-conversion")))))))))
(inputs (modify-inputs (package-inputs ffmpeg-4)
(delete "dav1d" "libaom" "rav1e" "srt")))))