ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 21:59:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ffmpeg-{5,4,3}: Fix build on i686 with binutils 2.41.

Browse source 
Fixes <https://issues.guix.gnu.org/72917>.

* gnu/packages/video.scm (ffmpeg-5): Replace 'bypass-openal-check
string substitution with one that matches on this and earlier
versions of ffmpeg.
(ffmpeg-4): Inherit package arguments from ffmpeg-5.

Reported-by: Dariqq <dariqq@posteo.net>

Change-Id: Ie5b51a174be45b511757dece369563975e498bac
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
André Batista 2024-09-03 11:30:59 -03:00 committed by Ludovic Courtès
parent 13e7bc4e01
commit ed95ddeb1e
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/video.scm
View file

@ -1845,6 +1845,9 @@ (define-public ffmpeg
;; https://lists.gnu.org/archive/html/guix-devel/2024-08/msg00159.html ;; https://lists.gnu.org/archive/html/guix-devel/2024-08/msg00159.html
(lambda _ (lambda _
(substitute* "configure" (substitute* "configure"
;; This string only matches on ffmpeg v6 and above.
;; Replace it with the one defined at ffmpeg-5 which
;; matches on all ffmpeg versions. See #71917.
(("alGetError \\|\\|") (("alGetError \\|\\|")
"alGetError \|\| true \|\|"))))) "alGetError \|\| true \|\|")))))
#~()) #~())
@ -1889,7 +1892,18 @@ (define-public ffmpeg-5
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0qwhyhil805hns7yksdxagnrcc90h60al7lz1rc65kd1j2w3nf2l")))))) "0qwhyhil805hns7yksdxagnrcc90h60al7lz1rc65kd1j2w3nf2l"))))
(arguments
(if (target-x86-32?)
(substitute-keyword-arguments (package-arguments ffmpeg)
((#:phases phases)
#~(modify-phases #$phases
(replace 'bypass-openal-check
(lambda _
(substitute* "configure"
(("die \"ERROR: openal not found\"")
"true")))))))
(package-arguments ffmpeg)))))
(define-public ffmpeg-4 (define-public ffmpeg-4
(package (package
@ -1907,7 +1921,7 @@ (define-public ffmpeg-4
(inputs (modify-inputs (package-inputs ffmpeg) (inputs (modify-inputs (package-inputs ffmpeg)
(replace "sdl2" sdl2-2.0))) (replace "sdl2" sdl2-2.0)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments ffmpeg) (substitute-keyword-arguments (package-arguments ffmpeg-5)
((#:configure-flags flags ''()) ((#:configure-flags flags ''())
#~(cons "--enable-avresample" #$flags)))))) #~(cons "--enable-avresample" #$flags))))))