nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-02 05:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,058,971 Commits 455 Branches 81 Tags
python-updates
Commit Graph

660 Commits

Author SHA1 Message Date
jopejoe1
08d90fa65e ffmpeg: add MPEG-5 EVC en/decoding 2024-04-11 16:51:12 +02:00
github-actions[bot]
5571d9244c Merge staging-next into staging 2024-04-09 12:01:50 +00:00
Atemu
37d6aef521 ffmpeg_7: add patch to fix checks 
https://trac.ffmpeg.org/ticket/10947#comment:1
 2024-04-08 20:50:37 +02:00
Atemu
c0fe794bff ffmpeg_7: init at 7.0 2024-04-05 20:48:13 +02:00
jopejoe1
fa222a324c ffmpeg: add avisynth support 2024-04-01 22:08:41 +02:00
jopejoe1
984c056f86 ffmpeg: make nvidia dependencies explicit 2024-03-26 20:52:46 +01:00
jopejoe1
887dd17f45 ffmpeg: add comment about why tensorflow is disabled 2024-03-26 20:51:35 +01:00
jopejoe1
782da363e9 ffmpeg: enable rtmp on full variant 2024-03-26 20:51:35 +01:00
jopejoe1
e42eb68de4 ffmpeg: enable opengpl on full variant 2024-03-26 20:51:34 +01:00
jopejoe1
11eb9de13b ffmpeg: make pkgConfigModules depend on included libs 2024-03-26 20:51:34 +01:00
jopejoe1
de72aac807 ffmpeg: cleanup darwin libraries 2024-03-25 21:58:18 +01:00
K900
229b4d208a ffmpeg: cherry-pick build fix for latest vulkan-headers 2024-03-25 09:05:00 +03:00
K900
304768b6ea ffmpeg: switch to fetchpatch2, remove unused patch 
This will be important later
 2024-03-25 09:02:39 +03:00
github-actions[bot]
b74fe245b8 Merge staging-next into staging 2024-03-17 00:02:45 +00:00
Atemu
0b9f28b5d4 Merge pull request #295691 from Atemu/ffmpeg-version-interface 
ffmpeg: make version a regular parameter and use callPackage pattern
 2024-03-16 20:57:38 +00:00
Sandro
4dd9a3526c ffmpeg: enable ffplay in small variant 
This is required for corrscope, also see https://github.com/NixOS/nixpkgs/issues/271863#issuecomment-1837491781
 2024-03-15 13:12:28 +01:00
Atemu
b72fefdcd1 ffmpeg: remove finalAttrs.version usage 
You should use the override interface to modify ABI version, not overrideAttrs.
 2024-03-14 14:02:31 +01:00
Atemu
ec34e3d740 ffmpeg: make version a regular parameter and use callPackage pattern 
This is (to my knowledge) a novel pattern that is similar to how
callPackages (note the s) is used. Whereas callPackages would try to make the
arguments of default.nix overrideable, this instead exposes the individual
packages' arguments.

This pattern is a lot more robust than the custom import pattern I had
implemented here before.

It also moves the implementation detail out of all-packages which is great.

Making the version part of the interface allows overriders to declare a
different ABI. Doing so via overrideAttrs would not affect the flags in the
arguments; effectively retaining the overridden package's ABI.

See https://github.com/NixOS/nixpkgs/issues/280645 for an instance of that.

By overriding the arguments using

    ffmpeg.override { version = "..."; ... }

the ABI will now be overridden as expected.

This means you could theoretically turn ffmpeg_5-full into ffmpeg_4-headless by overriding it with

    {
      version = "4.4.4";
      hash = ...;
      ffmpegVariant = "headless";
    }

Having these implicit parameters be explicit parameters feels a lot cleaner and
neater to work with.
 2024-03-14 14:02:31 +01:00
Atemu
cd48c48a87 Merge pull request #264621 from evanrichter/libvpl-for-intel-gpu 
oneVPL for intel gpus
 2024-03-14 03:59:11 +00:00
Atemu
883295650a ffmpeg: move extraPatches to generic drv 
This effectively obsoletes extraPatches
 2024-03-13 19:49:15 +01:00
github-actions[bot]
f4c4bfc9fc Merge master into staging-next 2024-03-13 18:00:53 +00:00
Sean Link
5857c130fc ffmpeg: add mingw support 
Part of a larger effort to add mingw support for qtmultimedia.
 2024-03-13 10:03:56 -06:00
jopejoe1
71b47cb872 ffmpeg: apply binutils patch only to ffmpeg_4 2024-03-09 16:42:01 +01:00
Philipp Jungkamp
88add7e28e ffmpeg: add withVPL option for libvpl 
Co-authored-by: Evan Richter <evanjrichter@gmail.com>
 2024-03-07 10:24:28 -07:00
Atemu
ab5c9ffb06 Merge pull request #292998 from jopejoe1/ffmpeg/update 
ffmpeg: 6.1 -> 6.1.1, 5.1.3 -> 5.1.4
 2024-03-07 08:52:46 +00:00
jopejoe1
19d6df886f ffmpeg: 6.1 -> 6.1.1 2024-03-03 12:51:44 +01:00
jopejoe1
ece21bf002 ffmpeg_5: 5.1.3 -> 5.1.4 2024-03-03 12:45:20 +01:00
jopejoe1
63bcf453d3 ffmpeg: Also sort withNvDec in the list 2024-02-28 19:19:14 +01:00
jopejoe1
ce12be4c16 ffmpeg: correct fdk-acc inclusion condition 
Only on gpl build does it need unfree
 2024-02-28 19:19:14 +01:00
jopejoe1
1e7fead1d5 ffmpeg: add second opencore amr option 
withOpencoreAmrnb only adds AMR-NB de/encoder also add adding withOpencoreAmrwb to also support AMR-WB decoder
 2024-02-28 19:19:14 +01:00
jopejoe1
893148f833 ffmpeg: also enable libfontconfig when withFontconfig is enabled 2024-02-28 19:19:14 +01:00
jopejoe1
c5c96b902b ffmpeg: fix enabeling withCaca 2024-02-28 19:19:14 +01:00
Mario Rodas
85e26d06ac Merge pull request #283732 from trofi/binutils-update 
binutils: 2.40 -> 2.41
 2024-02-22 21:36:26 -05:00
Atemu
dff14f8dac Merge pull request #281753 from Atemu/ffmpeg-vulkan-default 
ffmpeg: enable vulkan in small variant
 2024-02-20 13:21:54 +01:00
Atemu
3f89316af0 ffmpeg: work around libvulkan.so not being NEEDED 2024-02-15 01:47:15 +01:00
Joel Höner
1b96455bea ffmpeg_6: cherry-pick patch to fix VLC segfault 2024-02-13 21:52:26 +01:00
Sergei Trofimovich
8f42ee7512 ffmpeg: backport binutils-2.41 fix 2024-02-07 20:37:38 +00:00
Zane van Iperen
bb6e8320e5 ffmpeg: compile with harfbuzz 
Needed for the drawtext filter on 6.1+
 2024-02-06 21:31:33 +10:00
jopejoe1
c819f1aef8 ffmpeg: add jopejoe1 as maintainer 2024-02-02 13:00:36 +01:00
jopejoe1
f28414a6d1 ffmpeg: move chromaprint from jellyfin version into regular version 2024-02-02 10:16:03 +01:00
jopejoe1
48b20da0fb ffmpeg: turn libflite into option 2024-02-02 10:16:03 +01:00
jopejoe1
1cb111b489 ffmpeg: move version specific options to enableFeature 2024-02-02 10:16:03 +01:00
jopejoe1
1b22bac174 ffmpeg: rename withLibplacebo to withPlacebo 2024-02-02 09:59:46 +01:00
jopejoe1
b1328ab69b ffmpeg: sort features 2024-02-02 09:58:16 +01:00
jopejoe1
cfb8f44c8c ffmpeg: update license flags 
none = lgpl21Plus
version3 = lgpl3Plus
gpl = gpl2Plus
version3 + gpl = gpl3Plus
nonfree = unfree (unredistributable)

see https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/HEAD:/LICENSE.md

see for which libary which license is needed 8e23ebe6f9:/configure#l1804
 2024-02-01 00:22:05 +01:00
jopejoe1
074566850e ffmpeg: move libdc1394 and libraw1394 to the right option 2024-01-27 12:47:28 +01:00
jopejoe1
e8d2916513 ffmpeg: make some build options configurable 2024-01-27 12:43:43 +01:00
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 #282536)
 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