guix_mirror_bot pushed a commit to branch mesa-updates
in repository guix.
commit 1ff397068c8768190681a29fcbb5b0187a0991f2
Author: John Kehayias <[email protected]>
AuthorDate: Sun Sep 28 13:07:02 2025 -0400
gnu: ffmpeg-5: Fix build.
* gnu/packages/video.scm (ffmpeg-5)[arguments]: Add modules.
<#:configure-flags>: Remove "--enable-libplacebo".
[inputs]: Remove libplacebo.
(ffmpeg-4)[inputs]: Inherit from ffmpeg-5.
[arguments]: Remove modules.
<#:configure-flags>: Reduce as libplacebo flag is now removed via ffmpeg-5.
Change-Id: Ia13b297cb224abf8212e02a934f0f8fb04bce48e
---
gnu/packages/video.scm | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 1a7f6a148e..ef4ee11557 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -75,6 +75,7 @@
;;; Copyright © 2025 VnPower <[email protected]>
;;; Copyright © 2025 Zhu Zihao <[email protected]>
;;; Copyright © 2025 Remco van 't Veer <[email protected]>
+;;; Copyright © 2025 John Kehayias <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1911,16 +1912,22 @@ audio/video codec library.")
(base32
"1g8116rp4fgq82br8lclb2dmw3fvyh2zkzhnngm7z97pg1i0dypl"))))
(arguments
- (if (target-x86-32?)
- (substitute-keyword-arguments (package-arguments ffmpeg)
- ((#:phases phases)
+ (substitute-keyword-arguments (package-arguments ffmpeg)
+ ((#:modules modules %default-gnu-modules)
+ `((srfi srfi-1) ,@modules))
+ ((#:phases phases)
+ (if (target-x86-32?)
#~(modify-phases #$phases
(replace 'bypass-openal-check
(lambda _
(substitute* "configure"
(("die \"ERROR: openal not found\"")
- "true")))))))
- (package-arguments ffmpeg)))))
+ "true")))))
+ phases))
+ ((#:configure-flags flags ''())
+ #~(fold delete #$flags '("--enable-libplacebo")))))
+ (inputs (modify-inputs (package-inputs ffmpeg)
+ (delete "libplacebo")))))
(define-public ffmpeg-4
(package
@@ -1933,16 +1940,13 @@ audio/video codec library.")
(sha256
(base32
"01xb2vj4n52fv2y56n5ifirgzlg16qbgfg98f6ifbbhm6l6lwlgr"))))
- (inputs (modify-inputs (package-inputs ffmpeg)
+ (inputs (modify-inputs (package-inputs ffmpeg-5)
(replace "sdl2" sdl2-2.0)))
(arguments
(substitute-keyword-arguments (package-arguments ffmpeg-5)
- ((#:modules modules %default-gnu-modules)
- `((srfi srfi-1) ,@modules))
((#:configure-flags flags ''())
#~(cons "--enable-avresample"
- (fold delete #$flags '("--enable-libplacebo"
- "--enable-libshaderc"))))))))
+ (fold delete #$flags '("--enable-libshaderc"))))))))
(define-public ffmpeg-for-stepmania
(hidden-package
