2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-07 21:43:32 +00:00
Commit Graph

362 Commits

Author SHA1 Message Date
K900
4567be8aa5 ffmpeg: always use version from finalAttrs
In case of overrides and such
2024-01-25 14:01:53 +03:00
Vladimír Čunát
78b0905b1b
ffmpeg_4: avoid unknown configure option
This broke with 29d9badd51 (PR )
2024-01-22 10:48:22 +01:00
K900
29d9badd51 ffmpeg: build with shaderc instead of glslang
It actually builds and seems to be preferred upstream anyway:
da72aca7b0
2024-01-21 14:25:59 +03:00
K900
967d49b8a8 Merge remote-tracking branch 'origin/staging-next' into staging 2024-01-18 19:15:32 +03:00
Atemu
9ac7a0fb03 ffmpeg_4-full: disable VMAF
Became broken due to https://github.com/NixOS/nixpkgs/pull/274973

ffmpeg_4 is only kept for legacy reasons, so let's simply disable VMAF support.

Fixes https://github.com/NixOS/nixpkgs/issues/281415
2024-01-18 10:58:46 +01:00
Franz Pletz
31b46a3593
Merge pull request from rhododendrox/pr-update-libplacebo
libplacebo: 5.264.1 -> 6.338.1
2024-01-17 20:44:44 +01:00
github-actions[bot]
d841ab8796
Merge staging-next into staging 2024-01-14 12:01:53 +00:00
Atemu
66afe6cefc ffmpeg: use drv version for aribcaption configureFlags logic
`withAribcaption` would be true because, for the flags in the function argument,
ffmpeg_6-full's version is the deciding one. We will likely need a better
pattern here.

Fixes https://github.com/NixOS/nixpkgs/issues/280645
2024-01-13 19:31:55 +01:00
Randy Eckenrode
0ff6a0bdae
ffmpeg_6: make patch unconditional 2024-01-01 11:21:53 -05:00
Randy Eckenrode
38da7ef8cd
ffmpeg_6: fix build on x86_64-darwin
Cherry-pick commit from upstream that fixes “use of undeclared
identifier 'kVTCompressionPropertyKey_EncoderID'” error when building
ffmpeg 6.1 on x86_64-darwin.
2023-12-26 09:21:42 -05:00
rhododendrox
f4e7e4a19b ffmpeg_5: use libplacebo_5 2023-12-12 11:52:15 +01:00
arthsmn
3a9d9480ce ffmpeg: 6.0 -> 6.1 2023-12-04 08:04:15 -03:00
arthsmn
6c6a5062b7 ffmpeg: add arthsmn as a maintainer 2023-12-04 08:04:15 -03:00
arthsmn
319a37ebf5 ffmpeg: sort external libraries 2023-12-03 18:59:09 -03:00
arthsmn
ebd5a51661 ffmpeg: substitute sha256sum with hash 2023-12-03 18:59:09 -03:00
Adam Joseph
c7e0f6b905 treewide: s_targetPlatform_hostPlatform_ in non-compiler packages
stdenv.targetPlatform really shouldn't be used by software that
doesn't generate or manipulate binaries.  I reviewed all uses of
targetPlatform outside of pkgs/development/compilers and pkgs/stdenv
and replaced those which weren't involved in something which fits
these criteria.
2023-11-17 08:07:34 +00:00
Atemu
d326246c9a ffmpeg_4-full: disable glslang
abd83e2924 broke glslang support in ffmpeg_4. It's
only enabled in ffmepg-full and v4 is only kept for compat reasons, so let's
simply disable this feature.
2023-11-15 17:42:11 +01:00
Andrew Marshall
a473ea53e4 ffmpeg: set mainProgram
Needed for e.g. `nix run nixpkgs#ffmpeg-full` otherwise tries to exec
`ffmpeg-full`.
2023-09-30 20:41:55 +02:00
Alyssa Ross
c147fe79a5 ffmpeg: set strictDeps
This will hopefully prevent cross compilation regressions.
2023-09-14 14:45:48 +00:00
Alyssa Ross
f38a57f072 ffmpeg-full: fix cross 2023-09-14 14:45:48 +00:00
Michele Guerini Rocco
a91401f310
Merge pull request from rnhmjoj/pr-ffmpeg
ffmpeg: re-enable video4linux2 support
2023-09-11 20:30:20 +02:00
rnhmjoj
2ce1ae2cfd
ffmpeg: re-enable video4linux2 support
This is useful in some application like mpv to view the webcam stream.
It was enabled before ffmpeg and ffmpeg-full got merged in .
2023-09-09 01:04:15 +02:00
Rick van Schijndel
25a68e5ac1
Merge pull request from reckenrode/ffmpeg_4-fix
ffmpeg_4: fix crash with clang 16
2023-09-07 23:21:01 +02:00
Randy Eckenrode
f2e1dad58b
ffmpeg_4: fix crash with clang 16
ffmpeg_4 crashes in `ff_seek_frame_binary` due to UB and optimizations
clang 16 performs. This is fixed upstream in ffmpeg_5, but the patch can
be made to apply to ffmpeg_4.
2023-09-06 16:21:33 -04:00
Sandro Jäckel
9836e25054
ffmpeg: remove unused inputs and recs 2023-09-04 15:27:57 +02:00
Sandro Jäckel
700241a422
ffmpeg: include svt-av1 in small variant 2023-09-04 15:27:53 +02:00
Francesco Gazzetta
f8311f3747
Merge pull request from fgaz/ffmpeg/riscv
ffmpeg: fix configure errors on native riscv
2023-08-01 14:14:57 +02:00
Felix Bühler
0a2745684e
Merge pull request from Stunkymonkey/use-optionalString-then
treewide: use optionalString instead of 'then ""'
2023-07-22 13:02:47 +02:00
Francesco Gazzetta
01693fd5e8 ffmpeg: fix configure errors on native riscv
Like , 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-07-09 16:49:03 +02:00
Janik
8d716b0c36
Merge pull request from lopsided98/ffmpeg-cross-refs 2023-06-26 18:19:27 +02:00
Felix Buehler
f3719756b5 treewide: use optionalString instead of 'then ""' 2023-06-24 20:19:19 +02:00
Atemu
82ce18ec64
Merge pull request from Atemu/ffmpeg-remove-withLTO
ffmpeg: remove withLTO option
2023-05-30 18:14:07 +02:00
Atemu
c7b1d6b8d0 ffmpeg: remove withLTO option
It has been broken for a while, we shouldn't pretend that we support it.

Fixes https://github.com/NixOS/nixpkgs/issues/139168
2023-05-28 17:01:49 +02:00
Henri Rosten
ea5c5d44db ffmpeg_4: 4.4.3 -> 4.4.4
Signed-off-by: Henri Rosten <henri.rosten@unikie.com>
2023-05-26 07:15:16 +03:00
Robert Scott
32f663d5f5 ffmpeg_4: add patch for svt-av1 1.5.0 compatibility 2023-05-01 19:09:11 +01:00
Robert Scott
e03a6c1c1d ffmpeg_5: add patches for svt-av1 1.5.0 compatibility
from 6.0 branch
2023-05-01 19:09:11 +01:00
Atemu
b332f78d35
Merge pull request from aviallon/feature/ffmpeg-add-tensorflow
ffmpeg: add tensorflow dnn backend support
2023-04-30 23:10:04 +02:00
Isabelle
4e7276cc60
ffmpeg: 5.1.2 -> 5.1.3 () 2023-04-26 17:53:27 +02:00
Antoine Viallon
43797d4b96
ffmpeg: don't enable tensorflow by default for full
Co-authored-by: Atemu <atemu.main@gmail.com>
2023-04-25 17:37:39 +02:00
Antoine Viallon
e935fa1951
ffmpeg: add tensorflow dnn backend support 2023-04-05 00:26:36 +02:00
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 : 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
Ben Wolsieffer
88e8156503 ffmpeg: remove references to build platform compiler
When cross-compiling, the build platform compiler ends up in the runtime
closure because it is included in the configure flags that get embedded in the
binaries. To fix this, add the compiler to the remove-references-to invocation.
2023-02-19 00:21:11 -05: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