nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-05 19:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
676,386 Commits 201 Branches 125 Tags 5.9 GiB
3aba2cb8d7
Commit Graph

481 Commits

Author SHA1 Message Date
Robert Scott
53ca42587f ffmpeg: refactor mapped fetchpatch2 application 
this prevents us from easily including non-fetchpatch'ed
patches
 2024-06-10 22:18:07 +01:00
github-actions[bot]
c8c2ff3b9b
Merge staging-next into staging 2024-06-10 00:02:49 +00:00
Alexis Hildebrandt
755b915a15 treewide: Remove indefinite article from meta.description 
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
 2024-06-09 23:07:45 +02:00
Atemu
3d15ef2951
Merge pull request #316997 from jopejoe1/ffmpeg/feature/metal 
ffmpeg: add metal support
 2024-06-09 15:38:01 +02:00
jopejoe1
b1e72e8082 ffmpeg: add metal support 2024-06-07 19:27:03 +02:00
jopejoe1
00d7d60e2a ffmpeg_7: 7.0 -> 7.0.1 2024-06-05 19:28:46 +02:00
Robert Scott
c23f9d58ff ffmpeg, ffmpeg_5: add patches for CVE-2024-31578 2024-05-11 19:24:53 +01:00
Robert Scott
ff06e7d5e9 ffmpeg, ffmpeg_5: add patches for CVE-2024-31582 2024-05-11 19:22:08 +01:00
Robert Scott
4230c04c74 ffmpeg_5: add patch for CVE-2024-31585 2024-05-11 18:56:51 +01:00
Vladimír Čunát
0bf0fc0629
Revert "ffmpeg-full: disable avisynth on Darwin" 2024-05-08 06:59:37 +02:00
Atemu
b72561a394 ffmpeg-full: disable avisynth on Darwin 
See https://github.com/NixOS/nixpkgs/issues/309417
 2024-05-06 03:21:19 +02:00
Vladimír Čunát
e34c2340c2
Merge #286255: ffmpeg: add avisynth support 
...into staging
 2024-04-22 09:00:16 +02:00
Atemu
bde107e321
Merge pull request #303683 from jopejoe1/ffmpeg/codec2 
ffmpeg: codec2 support
 2024-04-22 03:33:58 +02:00
Atemu
b251c56cac
Merge pull request #303730 from jopejoe1/ffmpeg/jxl 
ffmpeg: jxl support
 2024-04-19 17:19:17 +02:00
github-actions[bot]
a459b363de
Merge master into staging-next 2024-04-16 12:01:11 +00:00
jopejoe1
68cb245ca1 ffmpeg_7: dvd reading support 2024-04-15 15:23:32 +02:00
jopejoe1
9a9e475ca4 ffmpeg: jxl support 2024-04-12 22:34:58 +02:00
jopejoe1
8f5da4db6e ffmpeg: codec2 support 2024-04-12 15:18:48 +02:00
Vladimír Čunát
24d4f2cd52
Merge branch 'staging' into staging-next 
Conflicts (tried to quickly resolve somehow, checked eval):
	pkgs/development/python-modules/apsw/default.nix
	pkgs/development/python-modules/mido/default.nix
	pkgs/development/python-modules/pytest-bdd/default.nix
	pkgs/development/python-modules/sparse/default.nix
 2024-04-12 07:06:54 +02:00
Atemu
3e4f96c930
Merge pull request #303165 from jopejoe1/ffmpeg/evc 
ffmpeg_7: add support for MPEG-5 EVC en/decoding
 2024-04-11 19:15:28 +02:00
jopejoe1
0dd8c95dcd ffmpeg: qr code support 2024-04-11 16:53:54 +02:00
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
K900
967d49b8a8 Merge remote-tracking branch 'origin/staging-next' into staging 2024-01-18 19:15:32 +03:00
Atemu
68500c37a3 ffmpeg: enable vulkan in small variant 
Closure size: 493.6M -> 494.8M

Fixes https://github.com/NixOS/nixpkgs/issues/281631
 2024-01-18 11:56:42 +01: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 #269415 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 #253915 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 #211834.
 2023-09-09 01:04:15 +02:00
Rick van Schijndel
25a68e5ac1
Merge pull request #253704 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 #242489 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 #239624 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 #220327, 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 #217087 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