diff options
| author | Josselin Poiret <dev@jpoiret.xyz> | 2024-01-30 10:56:58 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:44:51 +0200 |
| commit | c033fb81461a6696d6f22a29c5003486ed212e9e (patch) | |
| tree | e7ac19e7c57051bc391e573dbb31a8ce83a75aad /gnu/packages/video.scm | |
| parent | 7b10ca6fe2b2bd138d37142b479d0603ab656a38 (diff) | |
| download | guix-c033fb81461a6696d6f22a29c5003486ed212e9e.tar.gz guix-c033fb81461a6696d6f22a29c5003486ed212e9e.zip | |
gnu: ffmpeg: Fix builds.
* gnu/packages/patches/ffmpeg-remove-compressed_ten_bit_format.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/video.scm (ffmpeg-4): Use it.
(ffmpeg-3.4, ffmpeg-2.8): Use ffmpeg-4-binutils-2.41.patch.
Change-Id: Idaf1d80f33530ba6d8c3c60b284dc08e522ec220
Diffstat (limited to 'gnu/packages/video.scm')
| -rw-r--r-- | gnu/packages/video.scm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0100370e30..3da7a29c82 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1895,7 +1895,8 @@ audio/video codec library.") (sha256 (base32 "14xadxm1yaamp216nq09xwasxg5g133v86dbb33mdg5di1zrlhdg")) - (patches (search-patches "ffmpeg-4-binutils-2.41.patch")))) + (patches (search-patches "ffmpeg-remove-compressed_ten_bit_format.patch" + "ffmpeg-4-binutils-2.41.patch")))) (inputs (modify-inputs (package-inputs ffmpeg) (replace "sdl2" sdl2-2.0))) (arguments @@ -1913,7 +1914,8 @@ audio/video codec library.") version ".tar.xz")) (sha256 (base32 - "0np0yalqdrm7rn7iykgfzz3ly4vbgigrajg48c1l6n7qrzqvfszv")))) + "0np0yalqdrm7rn7iykgfzz3ly4vbgigrajg48c1l6n7qrzqvfszv")) + (patches (search-patches "ffmpeg-4-binutils-2.41.patch")))) (arguments (substitute-keyword-arguments (package-arguments ffmpeg-4) ((#:modules modules %default-gnu-modules) @@ -1924,7 +1926,8 @@ audio/video codec library.") '("--enable-libdav1d" "--enable-libaom" "--enable-librav1e" - "--enable-libsrt"))))) + "--enable-libsrt" + "--enable-libsvtav1"))))) (inputs (modify-inputs (package-inputs ffmpeg-4) (delete "dav1d" "libaom" "rav1e" "srt"))))) @@ -1938,7 +1941,8 @@ audio/video codec library.") version ".tar.xz")) (sha256 (base32 - "0c8m4hhv2k5fybha908wzrpnf3wqkq52hayl658jq4bah0igdfqz")))) + "0c8m4hhv2k5fybha908wzrpnf3wqkq52hayl658jq4bah0igdfqz")) + (patches (search-patches "ffmpeg-4-binutils-2.41.patch")))) (arguments `(#:tests? #f ; XXX: Enable them later, if required #:configure-flags |