Commit Graph

521 Commits

Author SHA1 Message Date
github-actions[bot]
b50e7536f8
Merge master into staging-next 2024-11-14 00:14:11 +00:00
jopejoe1
727175b548
ffmpeg: add missing variant requirements for amf (#353118) 2024-11-13 19:32:11 +01:00
jopejoe1
392ca599ae ffmpeg: add missing variant requirements for amf 2024-11-11 21:28:09 +01:00
Atemu
d2e8dbc576
ffmpeg: add librist (#353473) 2024-11-04 06:31:28 +01:00
randomizedcoder
18d48aa758 ffmpeg: add librist 2024-11-03 15:23:22 -08:00
K900
46a1f3aa58 Merge remote-tracking branch 'origin/staging-next' into staging 2024-11-03 11:04:59 +03:00
Atemu
ea1799ea8c
ffmpeg: disable xev{e,d} when under 7.1 (#353198) 2024-11-03 01:04:51 +01:00
Atemu
376509e0c5 ffmpeg: disable xev{e,d} when under 7.1
The update to xev caused an incompatibility with ffmpeg 7.0 which broke
handbrake's ffmpeg.

Fixes https://github.com/NixOS/nixpkgs/issues/353072
2024-11-02 19:59:50 +01:00
Johannes Jöns
7a5cc17456
ffmpeg: add new external libs added in 7.1 (#348798) 2024-10-26 21:23:51 +00:00
Emily
a162f7e57f
ffmpeg_{4,6,7}: Darwin clean‐ups and improvements (#351188) 2024-10-26 14:31:37 +01:00
Emily
2f31fd064f ffmpeg_7: remove obsolete macOS 10.12 SDK patch 2024-10-26 14:01:17 +01:00
Emily
d7e9d5d63d
ffmpeg: add kvazaar option (#351176) 2024-10-25 17:58:31 +01:00
Emily
927d45eccf ffmpeg_{4,6,7}: build with apple-sdk_15
Upstream is pretty good about using availability checks, and there
are runtime‐checked features for macOS 10.13, 11, and 12 that
are only available if we build with a modern SDK. This impacts,
e.g. hardware‐accelerated video decoding in mpv.

FFmpeg should still continue to build and run on all our supported
macOS releases, with runtime functionality being no worse than before
on older versions.
2024-10-25 14:59:36 +01:00
Emily
151d5da2e6 ffmpeg_{4,6,7}: remove redundant Darwin framework feature flags
All of these are supplied in the standard environment as part of the
SDK now, so there’s no closure difference at build or runtime and
no reason to turn them off.
2024-10-25 14:55:06 +01:00
Emily
49e79fb615 ffmpeg_{4,6,7}: clean up old Darwin SDK pattern 2024-10-25 14:51:32 +01:00
jopejoe1
77a6293b4f ffmpeg: add kvazaar option 2024-10-24 15:56:19 +02:00
K900
dee94df6f2 Merge remote-tracking branch 'origin/master' into staging-next 2024-10-24 09:28:51 +03:00
Peder Bergebakken Sundt
a6f72e581f ffmpeg_7-full: use stdenv.buildPlatform.canExecute 2024-10-21 11:34:19 +02:00
jopejoe1
fdf2cbdc1c ffmpeg: add lcevcdec option 2024-10-19 09:40:27 +02:00
jopejoe1
22faf0ac9e ffmpeg: add lc3 option 2024-10-19 09:40:27 +02:00
jopejoe1
46c012331f ffmpeg: add vvenc option 2024-10-19 09:40:27 +02:00
Atemu
13ed8a82c2
ffmpeg: add options for more subtitle decoding formats (#340587) 2024-10-11 02:32:28 +02:00
jopejoe1
c4fe4811fe ffmpeg: add withAribb24 options
enables decoding of ARIB subtitles
2024-10-10 17:55:28 +02:00
jopejoe1
09e56a61f6 ffmpeg: add withZvbi options
support for teletext decoding
2024-10-10 17:47:08 +02:00
Johannes Jöns
0ad0760cf3
ffmpeg: add withCdio option (#344016) 2024-10-06 15:20:03 +00:00
Emily
7ad7e69aa8 ffmpeg_7: 7.0.2 -> 7.1 2024-10-05 01:34:12 +01:00
Artturin
f0e657f3b1 Merge branch 'master' into staging-next 2024-09-25 06:05:01 +03:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
jopejoe1
2e8eda249d ffmpeg: add withCdio option 2024-09-23 16:18:32 +02:00
Atemu
37219e405c
ffmpeg: Enable vid-stab by default (#340304) 2024-09-22 10:27:01 +02:00
Johannes Jöns
71d97d6e0c
ffmpeg: add additional nvidia options (#338687) 2024-09-22 00:18:54 +00:00
Philip Taron
572baa788b
gcc: gcc_13 → gcc_14 (#340612)
@emilazy is co-responsible for choosing the merge this.
2024-09-12 15:21:00 -07:00
Fabián Heredia Montiel
a4145a81d1 treewide: add -Wno-error= due to compilation error with gcc_14 2024-09-11 01:44:17 -06:00
jopejoe1
18d3b57fa0 ffmpeg: add CudaNVCC option 2024-09-09 21:33:50 +02:00
jopejoe1
d45c5ab295 ffmpeg: add npp option 2024-09-09 21:33:46 +02:00
Zhong Jianxin
845e8ef8a3 ffmpeg: Enable vid-stab by default
[Vidstab][1] is an useful ffmpeg video stabilization filter.

Both [Debian][2] and [Archlinux][3] enable it on default ffmpeg build,
we should also enable it on default ffmpeg in nixpkgs.

On the `master` branch, closure size for ffmpeg-headless went up 182.9KiB.
```
$ nix store diff-closures nixpkgs#ffmpeg-headless^bin .#ffmpeg-headless^bin
ffmpeg-headless: +18.1 KiB
vid.stab-unstable: ∅ → 2022-05-30, +164.8 KiB

$ nvd diff $(nix build nixpkgs#ffmpeg-headless^bin --print-out-paths --no-link) $(nix build .#ffmpeg-headless^bin --print-out-paths --no-link)
<<< /nix/store/kwihalx7ryh51ghcp8f1hhy8skbdh8w9-ffmpeg-headless-6.1.2-bin
>>> /nix/store/ps62y85p9jgjbf2x9s97199mpqnd0ggz-ffmpeg-headless-6.1.2-bin
Added packages:
[A.]  #1  vid.stab-unstable  2022-05-30
Closure size: 78 -> 79 (4 paths added, 3 paths removed, delta +1, disk usage +182.9KiB).
```

[1]: http://public.hronopik.de/vid.stab/
[2]: https://salsa.debian.org/multimedia-team/ffmpeg/-/blob/debian/7%256.1.1-5/debian/control#L158
[3]: https://gitlab.archlinux.org/archlinux/packaging/packages/ffmpeg/-/blob/2-6.1.1-7/PKGBUILD?ref_type=tags#L73
2024-09-08 08:44:56 +08:00
Atemu
2b64c19269
ffmpeg: remove withOgg (#340217) 2024-09-08 02:06:24 +02:00
Emily
342fb8a152 ffmpeg: adjust update and pinning advice
It is best to keep as many FFmpeg dependencies unpinned as possible,
so that only the packages that actually break are kept behind on old
versions. I ran into many cases recently where a package was pinned
to an old version of FFmpeg but worked fine with the latest one,
making the older versions look more necessary than they actually were.

This will make it easier to find packages that need intervention to
be updated to newer versions and speed up the process of jettisoning
old FFmpeg versions. The cost of potentially holding back the default
version for a little while to let major parts of the ecosystem catch
up is minor by comparison, especially since it has happened with 7
anyway due to Darwin problems.
2024-09-07 20:31:19 +01:00
Emily
92b0f7cb13 ffmpeg: ffmpeg_6 -> ffmpeg_7 2024-09-07 20:31:19 +01:00
jopejoe1
1ed22ba893 ffmpeg: remove withOgg
does not do anything
2024-09-07 00:48:59 +02:00
github-actions[bot]
d62aaef66a
Merge master into staging-next 2024-08-28 00:13:03 +00:00
jopejoe1
9f821fa056 ffmpeg: fix build on darwin when rubberband is enabled 2024-08-24 17:00:28 +02:00
Emily
778806c4a7 ffmpeg_4: discourage further use 2024-08-22 15:22:25 +01:00
Atemu
e325795397
Merge pull request #334478 from jopejoe1/ffmpeg-ilbc
ffmpeg: add ilbc options
2024-08-18 15:04:41 +02:00
jopejoe1
d91ad22d82 ffmpeg: add ilbc options 2024-08-13 23:24:26 +02:00
Atemu
79f7a31408
Merge pull request #333671 from jopejoe1/ffmpeg-shine
ffmpeg: add shine option
2024-08-12 22:56:28 +02:00
Atemu
047bbb510c
Merge pull request #333714 from jopejoe1/ffmpeg-rubberband
ffmpeg: add rubberband option
2024-08-12 22:53:29 +02:00
jopejoe1
279f84453e ffmpeg: add rubberband option 2024-08-10 18:07:31 +02:00
jopejoe1
911869feaf ffmpeg: add shine option 2024-08-10 15:16:10 +02:00
Atemu
f4f78c86ea
Merge pull request #333646 from jopejoe1/ffmpeg-snappy
ffmpeg: add snappy option
2024-08-10 15:00:02 +02:00