* [bug#72876] [PATCH] gnu: Add ffmpeg-7.
@ 2024-08-29 15:25 Zheng Junjie
2024-09-07 16:10 ` bug#72876: " Z572
0 siblings, 1 reply; 2+ messages in thread
From: Zheng Junjie @ 2024-08-29 15:25 UTC (permalink / raw)
To: 72876
* 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 <dds@disroot.org>
;;; Copyright © 2023 Saku Laesvuori <saku@laesvuori.fi>
;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
-;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;;
;;; 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#72876: [PATCH] gnu: Add ffmpeg-7.
2024-08-29 15:25 [bug#72876] [PATCH] gnu: Add ffmpeg-7 Zheng Junjie
@ 2024-09-07 16:10 ` Z572
0 siblings, 0 replies; 2+ messages in thread
From: Z572 @ 2024-09-07 16:10 UTC (permalink / raw)
To: 72876-done
[-- Attachment #1: Type: text/plain, Size: 2372 bytes --]
Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:
> * 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 <dds@disroot.org>
> ;;; Copyright © 2023 Saku Laesvuori <saku@laesvuori.fi>
> ;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
> -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
> ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
> ;;;
> ;;; 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
push, close.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-09-07 16:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-29 15:25 [bug#72876] [PATCH] gnu: Add ffmpeg-7 Zheng Junjie
2024-09-07 16:10 ` bug#72876: " Z572
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).