From 216991afbd642218a3adb1149f41377b09c67442 Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Sat, 4 Jan 2025 17:18:05 +0100 Subject: [PATCH] gnu: mplayer: Fix build with gcc-14. * gnu/packages/video.scm (mplayer)[arguments]: In stage "configure", fixup "CFLAGS" in "config.mak" to relax gcc-14's strictness. Change-Id: I21e66222770182bfdb09092ef04b372d12690710 --- gnu/packages/video.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5220a10a80c78cf3520e7f9f738b46ea78941a9f..eb6e7974068c7e31add9d21cdcb7e21c07026969 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 Dmitry Nikolaev ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016, 2018, 2019, 2020, 2021 Eric Bavier -;;; Copyright © 2016, 2024 Janneke Nieuwenhuizen +;;; Copyright © 2016, 2024, 2025 Janneke Nieuwenhuizen ;;; Copyright © 2017 Feng Shu ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Chris Marusich @@ -2566,7 +2566,15 @@ streaming protocols.") (("#! /bin/sh") (string-append "#!" (which "sh")))) (setenv "SHELL" (which "bash")) (setenv "CONFIG_SHELL" (which "bash")) - (apply invoke "./configure" configure-flags)))))) + (apply invoke "./configure" configure-flags) + ;; Adding CFLAGS to #:configure-flags, or setting it in the + ;; enviroment does not work. Adding CFLAGS to #:make-flags + ;; breaks the build. + (substitute* "config.mak" + (("CFLAGS *=" all) + (string-append all + " -Wno-error=incompatible-pointer-types" + " -Wno-error=int-conversion")))))))) ;; FIXME: Add additional inputs once available. (native-inputs (list pkg-config yasm))