Subject: [PATCH] gnu: Add ffmpeg-7.

From: Zheng Junjie <[email-masked]>
Date: Thu, 29 Aug 2024 23:25:41 +0800

* gnu/packages/video.scm (ffmpeg-7): New variable.
(ffmpeg): Inherit above.

Change-Id: I39fdec3e380c8cf7feed74d5caa960fb33f0ffae
---
 gnu/packages/video.scm | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 84be73a433..b7f0854880 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -67,7 +67,7 @@
 ;;; Copyright © 2023 Dominik Delgado Steuter <[email-masked]>
 ;;; Copyright © 2023 Saku Laesvuori <[email-masked]>
 ;;; Copyright © 2023 Jaeme Sifat <[email-masked]>
-;;; Copyright © 2023 Zheng Junjie <[email-masked]>
+;;; Copyright © 2023, 2024 Zheng Junjie <[email-masked]>
 ;;; Copyright © 2024 Artyom V. Poptsov <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -1667,17 +1667,17 @@ (define-public libva-utils
 operate properly.")
     (license license:expat)))
 
-(define-public ffmpeg
+(define-public ffmpeg-7
   (package
     (name "ffmpeg")
-    (version "6.1.1")
+    (version "7.0.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "0s7r2qv8gh2a3w568n9xxgcz0q8j5ww1jdsci1hm9f4l1yqg9146"))))
+                "12dkv17mrsdqrm70c30azjw7qi1lfxca7xisw81x6flacddm2il6"))))
     (outputs '("out" "debug"))
     (build-system gnu-build-system)
     (inputs
@@ -1869,6 +1869,18 @@ (define-public ffmpeg
 audio/video codec library.")
     (license license:gpl2+)))
 
+(define-public ffmpeg
+  (package
+    (inherit ffmpeg-7)
+    (version "6.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
+                                  version ".tar.xz"))
+              (sha256
+               (base32
+                "0s7r2qv8gh2a3w568n9xxgcz0q8j5ww1jdsci1hm9f4l1yqg9146"))))))
+
 (define-public ffmpeg-5
   (package
     (inherit ffmpeg)

base-commit: d5312370b46ace47e138d84e1bb28e5651cee94b
-- 
2.45.2