Commit graph

320 commits

Author SHA1 Message Date
tilpner c6c2c7a293
ffmpeg_6: init at 6.0 2023-03-23 12:34:51 +01:00
Martin Weinelt da1a690688 Merge remote-tracking branch 'origin/master' into staging-next 2023-03-10 01:50:42 +01:00
misuzu d7867e8b8c ffmpeg: fix configure errors on native armv7l-linux
This fixes the following errors:

ERROR: cuda requested, but not all dependencies are satisfied: ffnvcodec
ERROR: cuvid requested, but not all dependencies are satisfied: ffnvcodec
ERROR: nvenc requested, but not all dependencies are satisfied: ffnvcodec
2023-03-09 17:05:53 +02:00
Vladimír Čunát 09768783f2
Merge #217044: ffmpeg: fix RUNPATH patching for OpenGL
...into staging
2023-03-02 09:02:57 +01:00
K900 2c1ff16299 ffmpeg-5: fix Vulkan builds
- add vulkan-headers as a dependency
- hack around ffmpeg using unstable VK_EXT names for extensions
- drive-by cleanup: remove unused inherit
2023-02-25 19:33:59 +03:00
GGG c83dc8d050 ffmpeg: fix RUNPATH patching
ffmpeg was having issues while trying to use the nvenc encodings due to
not finding libcuda.so.1

this was because addOpenGLRunpath was pointing to $out/lib instead of
using the placeholder path of the lib output

Co-authored-by: Mats <mats@mats.sh>
2023-02-18 21:23:16 -03:00
John Ericson 796313656c ffmpeg: Add meta.pkgConfigModules and test 2023-02-13 10:24:53 -05:00
Atemu e968d03321 ffmpeg_4: enable avresample again
As noted in
https://github.com/NixOS/nixpkgs/pull/211834#issuecomment-1417435991, removing
the deprecated avresample causes some packages to break. Keep avresample in
ffmpeg_4 only for now (it's removed in ffmpeg_5).
2023-02-07 13:47:29 +01:00
Atemu 4fc9f2e86b ffmpeg: merge with ffmpeg-full
A ton of cleanup and refactoring went into this. Too much to list.

Co-authored-by: Anderson Torres <torres.anderson.85@protonmail.com>
Co-authored-by: Martin Weinelt <mweinelt@users.noreply.github.com>
2023-01-27 18:19:18 +01:00
Isabelle 7180c66687 ffmpeg: 4.4.2 -> 4.4.3
https://github.com/FFmpeg/FFmpeg/blob/n4.4.3/Changelog
2022-12-09 10:39:57 +01:00
Artturin 22ec8cd807 ffmpeg: fix cross
pkg-config will be the next pkg-config so its targetPrefix will be wrong
2022-11-07 22:28:14 +02:00
github-actions[bot] f4c71b2f8c
Merge staging-next into staging 2022-10-23 18:02:19 +00:00
misuzu ba7f093cee ffmpeg: fix missing libpulse on armv7l-linux 2022-10-23 11:53:05 +03:00
Rick van Schijndel 390d78cc23 ffmpeg: use prefixed pkg-config if needed
Helpful for when we introduce an always prefixed pkg-config.
2022-10-19 20:38:28 +02:00
Sandro Jäckel 26a3bafb69
ffmpeg: remove 2.X and 3.X conditions 2022-09-29 11:33:40 +02:00
Sandro Jäckel 77e8784f4e
ffmpeg: remove 1.X conditions 2022-09-29 11:33:40 +02:00
Sandro Jäckel 8609c5598f
ffmpeg: remove 0.X conditions 2022-09-29 11:33:40 +02:00
Sandro Jäckel eb3fb81016
ffmpeg: inputs cleanup 2022-09-29 11:33:40 +02:00
Sandro Jäckel d369fa4ab8
ffmpeg: remove SDL1 support 2022-09-29 11:33:39 +02:00
Sandro Jäckel 7719968fb6
ffmpeg: cleanup and improve options, add vaapiSupport vpxSupport srtSupport 2022-09-29 11:33:39 +02:00
Sandro Jäckel 8d6cdd8aba
ffmpeg: cleanup darwin frameworks 2022-09-29 11:33:36 +02:00
Sandro Jäckel 8bbb3e7f23
ffmpeg: remove not necessary ? null 2022-09-29 11:32:36 +02:00
Frederik Rietdijk 63e480ba16 Merge staging-next into staging 2022-09-26 09:31:50 +02:00
zowoq 4177a5d748 ffmpeg_5: 5.1.1 -> 5.1.2
https://github.com/FFmpeg/FFmpeg/blob/n5.1.2/Changelog#L4
2022-09-26 10:29:10 +10:00
PedroHLC ☭ 0f39b3a85d
ffmpeg_4: patch for new SDL2 versioning scheme 2022-09-18 12:09:48 -03:00
zowoq 1a0bcbcb08 ffmpeg_5: 5.1 -> 5.1.1
1bad30dbe3:/Changelog#l4
2022-09-02 06:47:04 +10:00
Pierre Bourdon ece53aed8b
ffmpeg_5,ffmpeg_5-full: cherry-pick IPFS default gateway removal
ffmpeg 5.1 introduced ipfs:// and ipns:// streaming support as part of
libavformat. This new implementation falls back to fetching from an
untrusted 3rd party internet service in the (likely) case where a user
doesn't have a local IPFS gateway running on their computer. This puts
an unaudited 3rd party provider in a position where they can log and
alter any IPFS content being streamed by the ffmpeg library. No user
consent is collected at any point by the library.

ffmpeg developers are currently discussing [1] how to better implement
this feature. In the meantime, cherry-pick the proposed patch to disable
the default gateway until a better alternative is released.

[1] https://ffmpeg.org/pipermail/ffmpeg-devel/2022-August/299924.html
2022-08-13 00:16:28 +02:00
zowoq b29670fbf8 ffmpeg_5: 5.0.1 -> 5.1
90810bb37c:/Changelog#l9
2022-07-25 08:00:37 +10:00
zowoq af7d2aaa0d ffmpeg: add platforms 2022-07-21 12:43:08 +10:00
ajs124 fea398ab65 ffmpeg: 4.4.1 -> 4.4.2
d61977cbe4:/Changelog#l4

fixes CVE-2022-1475
2022-07-06 18:10:22 +02:00
zowoq fe871db088 ffmpeg_5: 5.0 -> 5.0.1
9687cae2b4:/Changelog#l4
2022-04-08 18:02:01 +10:00
Adam Joseph 8feed8e815
ffmpeg: honor pulseaudioSupport (#161017)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-03-27 17:01:58 +02:00
ajs124 8f390037eb ffmpeg_3: drop 2022-03-24 01:07:52 +01:00
github-actions[bot] bbbd0a92af
Merge master into staging-next 2022-01-25 00:02:13 +00:00
Zane van Iperen 7976f70bae ffmpeg_5: init at 5.0 2022-01-24 15:31:51 -08:00
André Silva e474360664
ffmpeg: enable libzimg
this is needed for the zscale video filter (http://underpop.online.fr/f/ffmpeg/help/zscale.htm.gz)
2021-12-31 15:52:04 +00:00
github-actions[bot] e0cac44f90
Merge master into staging-next 2021-11-07 12:01:18 +00:00
Zane van Iperen 4c6d0451b2
ffmpeg_2{,_8}: remove
Is ancient and insecure - nothing more should depend on it.
2021-11-07 16:03:14 +10:00
Ivan Kozik 205b617053 ffmpeg_4: 4.4 -> 4.4.1 2021-10-26 15:08:11 +00:00
TredwellGit b1f41c9184 ffmpeg: patch CVE-2021-38171 and CVE-2021-38291
https://nvd.nist.gov/vuln/detail/CVE-2021-38171
https://nvd.nist.gov/vuln/detail/CVE-2021-38291
2021-09-22 14:28:33 +00:00
Luke Granger-Brown f355e8a060
Merge pull request #134726 from risicle/ris-ffmpeg-tests
ffmpeg, ffmpeg-full: enable basic tests
2021-08-21 03:42:11 +01:00
Sandro f45fa31ab2
Merge pull request #120577 from MatthewCroughan/ffmpeg-srt 2021-08-20 13:00:18 +02:00
Robert Scott 649f0ed1a8 ffmpeg: enable basic tests 2021-08-18 23:52:00 +01:00
TredwellGit a83f82576b ffmpeg: patch CVE-2021-33815 and CVE-2021-38114
https://nvd.nist.gov/vuln/detail/CVE-2021-33815
https://nvd.nist.gov/vuln/detail/CVE-2021-38114
2021-08-17 02:31:11 +00:00
MatthewCroughan 065a8102c9
Update pkgs/development/libraries/ffmpeg/generic.nix
Co-authored-by: Michal Sojka <michal.sojka@cvut.cz>
2021-08-03 13:02:23 +01:00
Izorkin ae8dd3c149
ffmpeg_4: fix incorrect segment length in hls 2021-07-05 19:21:27 +03:00
AndersonTorres e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03:00
Robert Schütz a20dd34600
ffmpeg_3: mark as insecure (#123496) 2021-05-19 23:45:41 +02:00
Vladimír Čunát 3e43d42f87
ffmpeg_4: only apply the patch on darwin
It's not a big deal, but why rebuild the linux dependencies now.
2021-05-16 09:31:27 +02:00
Zane van Iperen 8f64c5d9fc
ffmpeg_4: fix build error on darwin
See https://trac.ffmpeg.org/ticket/9242
2021-05-16 08:05:03 +10:00