[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
220/416: gnu: ffmpeg-5: Rename variable to ffmpeg.
From: |
guix-commits |
Subject: |
220/416: gnu: ffmpeg-5: Rename variable to ffmpeg. |
Date: |
Fri, 14 Apr 2023 15:25:56 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit f3b5201c86ea1b71ef4420c8ab4be7aedf1de6a5
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Mar 24 23:38:07 2023 -0400
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-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
- 192/416: gnu: gstreamer: Do not reference Python., (continued)
- 192/416: gnu: gstreamer: Do not reference Python., guix-commits, 2023/04/14
- 194/416: gnu: Add rust-cargon-0.0., guix-commits, 2023/04/14
- 203/416: gnu: Add rust-os-info-3., guix-commits, 2023/04/14
- 205/416: gnu: Add rust-cbindgen-0.20., guix-commits, 2023/04/14
- 206/416: gnu: rust-cargo: Update to 0.60.0., guix-commits, 2023/04/14
- 207/416: gnu: rav1e: Fix building., guix-commits, 2023/04/14
- 209/416: NEWS: Mention new rpm format., guix-commits, 2023/04/14
- 214/416: gnu: gst-plugins-bad: Update to 1.22.1 and reinstate a few tests., guix-commits, 2023/04/14
- 215/416: gnu: gst-plugins-ugly: Update to 1.22.1., guix-commits, 2023/04/14
- 216/416: gnu: gst-libav: Update to 1.22.1., guix-commits, 2023/04/14
- 220/416: gnu: ffmpeg-5: Rename variable to ffmpeg.,
guix-commits <=
- 212/416: gnu: gst-plugins-base: Update to 1.22.1., guix-commits, 2023/04/14
- 221/416: gnu: ffmpeg: Update to 6.0., guix-commits, 2023/04/14
- 229/416: gnu: qt3d-5: Update to 5.15.8., guix-commits, 2023/04/14
- 234/416: gnu: qtdeclarative-5: Update to 5.15.8., guix-commits, 2023/04/14
- 245/416: gnu: qtlocation: Update to 5.15.5., guix-commits, 2023/04/14
- 248/416: gnu: qtquickcontrols-5: Update to 5.15.8., guix-commits, 2023/04/14
- 249/416: gnu: qtquickcontrols2-5: Update to 5.15.8., guix-commits, 2023/04/14
- 266/416: gnu: ruby-puma: Disable a flaky test., guix-commits, 2023/04/14
- 278/416: gnu: python-coverage: Update to 5.5., guix-commits, 2023/04/14
- 289/416: gnu: Add orangeduck-mpc., guix-commits, 2023/04/14