gnu: FFmpeg: Update to 4.3.
* gnu/packages/video.scm (ffmpeg): Update to 4.3. [source]: Remove obsolete patch. [inputs]: Add rav1e. [arguments]: Pass "--enable-librav1e" to #:configure-flags. (ffmpeg-3.4): Don't build with librav1e. [inputs]: Remove rav1e. [arguments]: Remove "--enable-librav1e" from #:configure-flags. * gnu/packages/patches/ffmpeg-prefer-dav1d.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it.master
parent
5e5776dfde
commit
e68dd68ffe
|
@ -917,7 +917,6 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/fasthenry-spSolve.patch \
|
%D%/packages/patches/fasthenry-spSolve.patch \
|
||||||
%D%/packages/patches/fasthenry-spFactor.patch \
|
%D%/packages/patches/fasthenry-spFactor.patch \
|
||||||
%D%/packages/patches/fbreader-curl-7.62.patch \
|
%D%/packages/patches/fbreader-curl-7.62.patch \
|
||||||
%D%/packages/patches/ffmpeg-prefer-dav1d.patch \
|
|
||||||
%D%/packages/patches/fifengine-swig-compat.patch \
|
%D%/packages/patches/fifengine-swig-compat.patch \
|
||||||
%D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \
|
%D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \
|
||||||
%D%/packages/patches/fifo-map-remove-catch.hpp.patch \
|
%D%/packages/patches/fifo-map-remove-catch.hpp.patch \
|
||||||
|
|
|
@ -1,43 +0,0 @@
|
||||||
When decoding AV1 files, prefer dav1d over libaom for performance
|
|
||||||
reasons.
|
|
||||||
|
|
||||||
Patch copied from upstream source repository:
|
|
||||||
|
|
||||||
<https://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commitdiff;h=dc0806dd25882f41f6085c8356712f95fded56c7>
|
|
||||||
|
|
||||||
From dc0806dd25882f41f6085c8356712f95fded56c7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: James Almer <jamrial@gmail.com>
|
|
||||||
Date: Sun, 15 Sep 2019 11:29:56 -0300
|
|
||||||
Subject: [PATCH] avcodec/allcodecs: make libdav1d the preferred AV1 decoder
|
|
||||||
|
|
||||||
It's considerably faster than libaom in most systems.
|
|
||||||
|
|
||||||
Reviewed-by: BBB
|
|
||||||
Signed-off-by: James Almer <jamrial@gmail.com>
|
|
||||||
---
|
|
||||||
libavcodec/allcodecs.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
|
|
||||||
index 5130fca026..d5dfba1877 100644
|
|
||||||
--- a/libavcodec/allcodecs.c
|
|
||||||
+++ b/libavcodec/allcodecs.c
|
|
||||||
@@ -680,7 +680,6 @@ extern AVCodec ff_pcm_mulaw_at_encoder;
|
|
||||||
extern AVCodec ff_pcm_mulaw_at_decoder;
|
|
||||||
extern AVCodec ff_qdmc_at_decoder;
|
|
||||||
extern AVCodec ff_qdm2_at_decoder;
|
|
||||||
-extern AVCodec ff_libaom_av1_decoder;
|
|
||||||
extern AVCodec ff_libaom_av1_encoder;
|
|
||||||
extern AVCodec ff_libaribb24_decoder;
|
|
||||||
extern AVCodec ff_libcelt_decoder;
|
|
||||||
@@ -738,6 +737,7 @@ extern AVCodec ff_idf_decoder;
|
|
||||||
/* external libraries, that shouldn't be used by default if one of the
|
|
||||||
* above is available */
|
|
||||||
extern AVCodec ff_h263_v4l2m2m_encoder;
|
|
||||||
+extern AVCodec ff_libaom_av1_decoder;
|
|
||||||
extern AVCodec ff_libopenh264_encoder;
|
|
||||||
extern AVCodec ff_libopenh264_decoder;
|
|
||||||
extern AVCodec ff_h264_amf_encoder;
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
|
@ -937,16 +937,14 @@ operate properly.")
|
||||||
(define-public ffmpeg
|
(define-public ffmpeg
|
||||||
(package
|
(package
|
||||||
(name "ffmpeg")
|
(name "ffmpeg")
|
||||||
(version "4.2.3")
|
(version "4.3")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
|
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
|
||||||
version ".tar.xz"))
|
version ".tar.xz"))
|
||||||
;; See <https://issues.guix.gnu.org/issue/39719>
|
|
||||||
(patches (search-patches "ffmpeg-prefer-dav1d.patch"))
|
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0cddkb5sma9dzy8i59sfls19rhjlq40zn9mh3x666dqkxl5ckxlx"))))
|
"0pbrsv5v96yd8qzb9bk4kw7qk4xqpi03rsd5xfbwnjzlhijd02hx"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
`(("dav1d" ,dav1d)
|
`(("dav1d" ,dav1d)
|
||||||
|
@ -973,6 +971,7 @@ operate properly.")
|
||||||
("mesa" ,mesa)
|
("mesa" ,mesa)
|
||||||
("openal" ,openal)
|
("openal" ,openal)
|
||||||
("pulseaudio" ,pulseaudio)
|
("pulseaudio" ,pulseaudio)
|
||||||
|
("rav1e" ,rav1e)
|
||||||
("sdl" ,sdl2)
|
("sdl" ,sdl2)
|
||||||
("soxr" ,soxr)
|
("soxr" ,soxr)
|
||||||
("speex" ,speex)
|
("speex" ,speex)
|
||||||
|
@ -1054,6 +1053,7 @@ operate properly.")
|
||||||
"--enable-libmp3lame"
|
"--enable-libmp3lame"
|
||||||
"--enable-libopus"
|
"--enable-libopus"
|
||||||
"--enable-libpulse"
|
"--enable-libpulse"
|
||||||
|
"--enable-librav1e"
|
||||||
"--enable-libsoxr"
|
"--enable-libsoxr"
|
||||||
"--enable-libspeex"
|
"--enable-libspeex"
|
||||||
"--enable-libtheora"
|
"--enable-libtheora"
|
||||||
|
@ -1132,10 +1132,10 @@ audio/video codec library.")
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments ffmpeg)
|
(substitute-keyword-arguments (package-arguments ffmpeg)
|
||||||
((#:configure-flags flags)
|
((#:configure-flags flags)
|
||||||
`(delete "--enable-libdav1d" (delete "--enable-libaom"
|
`(delete "--enable-libdav1d" (delete "--enable-libaom" (delete "--enable-librav1e"
|
||||||
,flags)))))
|
,flags))))))
|
||||||
(inputs (alist-delete "dav1d" (alist-delete "libaom"
|
(inputs (alist-delete "dav1d" (alist-delete "libaom" (alist-delete "rav1e"
|
||||||
(package-inputs ffmpeg))))))
|
(package-inputs ffmpeg)))))))
|
||||||
|
|
||||||
(define-public ffmpeg-for-stepmania
|
(define-public ffmpeg-for-stepmania
|
||||||
(hidden-package
|
(hidden-package
|
||||||
|
|
Reference in New Issue