From f3b5201c86ea1b71ef4420c8ab4be7aedf1de6a5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 24 Mar 2023 23:38:07 -0400 Subject: 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. --- gnu/packages/video.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages/video.scm') 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 -- cgit 1.4.1