diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-24 23:38:07 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-14 15:11:37 -0400 |
| commit | f3b5201c86ea1b71ef4420c8ab4be7aedf1de6a5 (patch) | |
| tree | ea1b93c7c71e174a839d16223b961ee9fbe9a201 /gnu/packages | |
| parent | de97f3fad9d8942cca3131b02f323da01378e7c9 (diff) | |
| download | guix-f3b5201c86ea1b71ef4420c8ab4be7aedf1de6a5.tar.gz | |
gnu: ffmpeg-5: Rename variable to ffmpeg.
* 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.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/jami.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/video.scm | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 4e8d36ca96..65607249ba 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -349,7 +349,7 @@ (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 @@ "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" diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8ecbaa2602..bf9a7c8d03 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1576,7 +1576,7 @@ These tools require a supported graphics chip, driver, and VA-API back end to operate properly.") (license license:expat))) -(define-public ffmpeg-5 +(define-public ffmpeg (package (name "ffmpeg") (version "5.1.2") @@ -1772,7 +1772,7 @@ audio/video codec library.") (define-public ffmpeg-4 (package - (inherit ffmpeg-5) + (inherit ffmpeg) (version "4.4.2") (source (origin (method url-fetch) @@ -1781,10 +1781,10 @@ audio/video codec library.") (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 @@ audio/video codec library.") (inputs (modify-inputs (package-inputs ffmpeg-3.4) (delete "libwebp"))))) -(define-public ffmpeg ffmpeg-5) - (define-public ffmpeg-for-stepmania (hidden-package (package |