TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: ffmpeg-5: Rename variable to ffmpeg.

Browse source 
* gnu/packages/video.scm (ffmpeg-5): Rename to...
(ffmpeg): ... this, replacing the old 'ffmpeg' alias.
(ffmpeg-4): Adjust accordingly.
* gnu/packages/jami.scm (ffmpeg-jami): Likewise.
This commit is contained in:
Maxim Cournoyer 2023-03-24 23:38:07 -04:00
parent de97f3fad9
commit f3b5201c86
No known key found for this signature in database
GPG key ID: 1260E46482E63562
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/jami.scm
View file

@ -349,7 +349,7 @@ (define (ffmpeg-compose-configure-flags)
(define-public ffmpeg-jami
(package
(inherit ffmpeg-5)
(inherit ffmpeg)
(name "ffmpeg-jami")
;; XXX: Use a slightly older version, otherwise the
;; 'libopusdec-enable-FEC' patch doesn't apply.
@ -363,7 +363,7 @@ (define-public ffmpeg-jami
"0yq0jcdc4qm5znrzylj3dsicrkk2n3n8bv28vr0a506fb7iglbpg"))))
(outputs '("out" "debug"))
(arguments
(substitute-keyword-arguments (package-arguments ffmpeg-5)
(substitute-keyword-arguments (package-arguments ffmpeg)
((#:configure-flags _ '())
#~(cons* "--disable-static"
"--enable-shared"

10
gnu/packages/video.scm
View file

@ -1576,7 +1576,7 @@ (define-public libva-utils
operate properly.")
(license license:expat)))
(define-public ffmpeg-5
(define-public ffmpeg
(package
(name "ffmpeg")
(version "5.1.2")
@ -1772,7 +1772,7 @@ (define-public ffmpeg-5
(define-public ffmpeg-4
(package
(inherit ffmpeg-5)
(inherit ffmpeg)
(version "4.4.2")
(source (origin
(method url-fetch)
@ -1781,10 +1781,10 @@ (define-public ffmpeg-4
(sha256
(base32
"14xadxm1yaamp216nq09xwasxg5g133v86dbb33mdg5di1zrlhdg"))))
(inputs (modify-inputs (package-inputs ffmpeg-5)
(inputs (modify-inputs (package-inputs ffmpeg)
(replace "sdl2" sdl2-2.0)))
(arguments
(substitute-keyword-arguments (package-arguments ffmpeg-5)
(substitute-keyword-arguments (package-arguments ffmpeg)
((#:configure-flags flags ''())
#~(cons "--enable-avresample" #$flags))))))
@ -1863,8 +1863,6 @@ (define-public ffmpeg-2.8
(inputs (modify-inputs (package-inputs ffmpeg-3.4)
(delete "libwebp")))))
(define-public ffmpeg ffmpeg-5)
(define-public ffmpeg-for-stepmania
(hidden-package
(package