Commit Graph

114 Commits

Author SHA1 Message Date
Justinas Stankevicius
59d2de73ed ffmpeg: add libplacebo 2023-04-02 17:58:40 +03:00
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
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
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
Adam Joseph
8feed8e815
ffmpeg: honor pulseaudioSupport (#161017)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-03-27 17:01:58 +02: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
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
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
AndersonTorres
e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03:00
github-actions[bot]
c63e69cd89
Merge staging-next into staging 2021-05-06 12:23:32 +00:00
Robert Schütz
900fd5d09f ffmpeg_2: mark as insecure 2021-05-01 20:52:27 +02:00
matthewcroughan
47586a182d ffmpeg: add support for libsrt
based upon 47801afc3d
2021-04-24 22:14:04 +01:00
TredwellGit
72354f8ec1 ffmpeg: 4.3.2 -> 4.4
https://github.com/FFmpeg/FFmpeg/blob/n4.4/Changelog
2021-04-10 08:30:54 +00:00
Sandro Jäckel
3453b89f4b
lzma: deprecate alias 2021-04-04 19:49:52 +02:00
volth
bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
Ben Siraphob
66e44425c6 pkgs/development/libraries: stdenv.lib -> lib 2021-01-21 19:11:02 -08:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
David Guibert
1b54b2aa0d ffmpeg: set explicit --enable-libass
needed for subtitles filter.
2020-08-15 08:54:01 +02:00
Orivej Desh
aa44ca368a ffmpeg: add libaom to build inputs only if enabled 2020-05-23 19:56:22 +00:00
Florian Klink
a42e33612a
Merge pull request #87968 from elohmeier/ffmpeg-addOpenGLRunpath2
ffmpeg: extend addOpenGLRunpath to handle libcuda referencing libraries
2020-05-16 21:51:25 +02:00
Enno Lohmeier
78987e2af0 ffmpeg: extend addOpenGLRunpath to handle libcuda referencing libraries 2020-05-16 21:48:59 +02:00
John Ericson
ee8cfe4bf3 treewide: pkg-config has targetPrefix 2020-05-16 00:21:21 +00:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Andrew Childs
4ac6c244cc ffmpeg: fix vdpauSupport=false 2020-02-09 09:23:57 +01:00
Jörg Thalheim
1a931f1f60
Revert "Revert "ffmpeg: fix cross compilation""
This reverts commit 7d46f7363c.

This change was accidentally commit to master. To avoid a mass-rebuild we
actually apply this change on staging first.
2020-01-04 08:26:03 +00:00
Jörg Thalheim
7d46f7363c
Revert "ffmpeg: fix cross compilation"
This reverts commit f6f8f0b75a.

avoid mass-rebuild on master; move to staging instead.
2020-01-04 08:25:54 +00:00