From f3b5201c86ea1b71ef4420c8ab4be7aedf1de6a5 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Fri, 24 Mar 2023 23:38:07 -0400
Subject: [PATCH] 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/jami.scm  |  4 ++--
 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 (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"
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 @@ (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