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

[guix-commits]

guix_mirror_bot pushed a commit to branch master
in repository guix.

commit 47d3129c5c0efceea23b7677ac9d05c3bca5702b
Author: Dariqq <dar...@posteo.net>
AuthorDate: Mon Jul 21 06:25:25 2025 +0000

    gnu: ffmpeg@6: Fix build with gcc-14 on i686-linux.
    
    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 <andr...@enge.fr>
---
 gnu/packages/video.scm | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 54e7bd3443..1891885e40 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -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")))))