futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions 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 30f0fd2176
commit d624cd4c84
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-public ffmpeg-jami (define-public ffmpeg-jami
(package (package
(inherit ffmpeg-5) (inherit ffmpeg)
(name "ffmpeg-jami") (name "ffmpeg-jami")
;; XXX: Use a slightly older version, otherwise the ;; XXX: Use a slightly older version, otherwise the
;; 'libopusdec-enable-FEC' patch doesn't apply. ;; 'libopusdec-enable-FEC' patch doesn't apply.
@ -363,7 +363,7 @@
"0yq0jcdc4qm5znrzylj3dsicrkk2n3n8bv28vr0a506fb7iglbpg")))) "0yq0jcdc4qm5znrzylj3dsicrkk2n3n8bv28vr0a506fb7iglbpg"))))
(outputs '("out" "debug")) (outputs '("out" "debug"))
(arguments (arguments
(substitute-keyword-arguments (package-arguments ffmpeg-5) (substitute-keyword-arguments (package-arguments ffmpeg)
((#:configure-flags _ '()) ((#:configure-flags _ '())
#~(cons* "--disable-static" #~(cons* "--disable-static"
"--enable-shared" "--enable-shared"

10
gnu/packages/video.scm
View File

@ -1576,7 +1576,7 @@ These tools require a supported graphics chip, driver, and VA-API back end to
operate properly.") operate properly.")
(license license:expat))) (license license:expat)))
(define-public ffmpeg-5 (define-public ffmpeg
(package (package
(name "ffmpeg") (name "ffmpeg")
(version "5.1.2") (version "5.1.2")
@ -1772,7 +1772,7 @@ audio/video codec library.")
(define-public ffmpeg-4 (define-public ffmpeg-4
(package (package
(inherit ffmpeg-5) (inherit ffmpeg)
(version "4.4.2") (version "4.4.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -1781,10 +1781,10 @@ audio/video codec library.")
(sha256 (sha256
(base32 (base32
"14xadxm1yaamp216nq09xwasxg5g133v86dbb33mdg5di1zrlhdg")))) "14xadxm1yaamp216nq09xwasxg5g133v86dbb33mdg5di1zrlhdg"))))
(inputs (modify-inputs (package-inputs ffmpeg-5) (inputs (modify-inputs (package-inputs ffmpeg)
(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)
((#:configure-flags flags ''()) ((#:configure-flags flags ''())
#~(cons "--enable-avresample" #$flags)))))) #~(cons "--enable-avresample" #$flags))))))
@ -1863,8 +1863,6 @@ audio/video codec library.")
(inputs (modify-inputs (package-inputs ffmpeg-3.4) (inputs (modify-inputs (package-inputs ffmpeg-3.4)
(delete "libwebp"))))) (delete "libwebp")))))
(define-public ffmpeg ffmpeg-5)
(define-public ffmpeg-for-stepmania (define-public ffmpeg-for-stepmania
(hidden-package (hidden-package
(package (package