amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ffmpeg-5: Fix build.

Browse source 
* 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
This commit is contained in:
John Kehayias 2025-09-28 13:07:02 -04:00 • committed by Maxim Cournoyer
parent 2de488a8ab
commit ca5a56c4a2
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/video.scm
View file

@ -75,6 +75,7 @@
;;; Copyright © 2025 VnPower <vnpower@loang.net> ;;; Copyright © 2025 VnPower <vnpower@loang.net>
;;; Copyright © 2025 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2025 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2025 Remco van 't Veer <remco@remworks.net> ;;; Copyright © 2025 Remco van 't Veer <remco@remworks.net>
;;; Copyright © 2025 John Kehayias <john@guixotic.coop>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1911,16 +1912,22 @@ audio/video codec library.")
(base32 (base32
"1g8116rp4fgq82br8lclb2dmw3fvyh2zkzhnngm7z97pg1i0dypl")))) "1g8116rp4fgq82br8lclb2dmw3fvyh2zkzhnngm7z97pg1i0dypl"))))
(arguments (arguments
(if (target-x86-32?) (substitute-keyword-arguments (package-arguments ffmpeg)
(substitute-keyword-arguments (package-arguments ffmpeg) ((#:modules modules %default-gnu-modules)
((#:phases phases) `((srfi srfi-1) ,@modules))
((#:phases phases)
(if (target-x86-32?)
#~(modify-phases #$phases #~(modify-phases #$phases
(replace 'bypass-openal-check (replace 'bypass-openal-check
(lambda _ (lambda _
(substitute* "configure" (substitute* "configure"
(("die \"ERROR: openal not found\"") (("die \"ERROR: openal not found\"")
"true"))))))) "true")))))
(package-arguments ffmpeg))))) phases))
((#:configure-flags flags ''())
#~(fold delete #$flags '("--enable-libplacebo")))))
(inputs (modify-inputs (package-inputs ffmpeg)
(delete "libplacebo")))))
(define-public ffmpeg-4 (define-public ffmpeg-4
(package (package
@ -1933,16 +1940,13 @@ audio/video codec library.")
(sha256 (sha256
(base32 (base32
"01xb2vj4n52fv2y56n5ifirgzlg16qbgfg98f6ifbbhm6l6lwlgr")))) "01xb2vj4n52fv2y56n5ifirgzlg16qbgfg98f6ifbbhm6l6lwlgr"))))
(inputs (modify-inputs (package-inputs ffmpeg) (inputs (modify-inputs (package-inputs ffmpeg-5)
(replace "sdl2" sdl2-2.0))) (replace "sdl2" sdl2-2.0)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments ffmpeg-5) (substitute-keyword-arguments (package-arguments ffmpeg-5)
((#:modules modules %default-gnu-modules)
`((srfi srfi-1) ,@modules))
((#:configure-flags flags ''()) ((#:configure-flags flags ''())
#~(cons "--enable-avresample" #~(cons "--enable-avresample"
(fold delete #$flags '("--enable-libplacebo" (fold delete #$flags '("--enable-libshaderc"))))))))
"--enable-libshaderc"))))))))
(define-public ffmpeg-for-stepmania (define-public ffmpeg-for-stepmania
(hidden-package (hidden-package