David Guibert
1b54b2aa0d
ffmpeg: set explicit --enable-libass
...
needed for subtitles filter.
2020-08-15 08:54:01 +02:00
zowoq
916bc99f2c
ffmpeg: 4.3 -> 4.3.1
2020-07-17 09:28:45 +10:00
zowoq
88c720f0bf
ffmpeg_3_4: 3.4.7 -> 3.4.8
2020-07-17 09:28:45 +10:00
zowoq
92cfd28d2b
ffmpeg_2_8: 2.8.16 -> 2.8.17
2020-07-17 09:28:45 +10:00
zowoq
f9e5ca8e58
ffmpeg: 4.2.3 -> 4.3
2020-06-18 14:56:18 +10:00
Frederik Rietdijk
362d88c2b1
Merge staging-next into staging
2020-05-27 15:27:28 +02:00
zowoq
cfaa8035d7
ffmpeg_2_8: 2.8.15 -> 2.8.16
2020-05-24 10:44:45 +10:00
zowoq
0e384147f9
ffmpeg_4: 4.2.2 -> 4.2.3
2020-05-24 10:44:45 +10: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
Frederik Rietdijk
981b94442b
Merge staging-next into staging
2020-01-05 16:10:40 +01:00
zowoq
c13f1a508d
ffmpeg_2_8: 2.8.14 -> 2.8.15
2020-01-04 11:50:10 +00:00
zowoq
115791b9ab
ffmpeg_4: 4.2.1 -> 4.2.2
2020-01-04 11:50:10 +00:00
Jörg Thalheim
1a931f1f60
Revert "Revert "ffmpeg: fix cross compilation""
...
This reverts commit 7d46f7363c
2020-01-04 08:26:03 +00:00
Jörg Thalheim
7d46f7363c
Revert "ffmpeg: fix cross compilation"
...
This reverts commit f6f8f0b75a
2020-01-04 08:25:54 +00:00
Daniel Fullmer
1b591acf6b
ffmpeg: fix cross compilation
2020-01-04 08:25:51 +00:00
Jörg Thalheim
f1568223c9
Revert "ffmpeg: fix cross compilation"
...
This reverts commit f6f8f0b75a
2020-01-04 08:24:30 +00:00
Daniel Fullmer
f6f8f0b75a
ffmpeg: fix cross compilation
2020-01-04 02:14:53 -05:00
Robin Gloster
4a8de55be0
ffmpeg: fix for structured attrs
2019-12-31 01:26:02 +01:00
Vladimír Čunát
37e1da2874
ffmpeg: 3.4.6 -> 3.4.7 (security)
...
Fixes #73628 (many CVEs).
https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/289a79d545e83a:/Changelog
2019-12-29 10:40:04 +01:00
Mateusz Kowalczyk
1451a52a38
Remove myself (fuuzetsu) from maintainer lists
...
I haven't been doing any maintenance for a long time now and not only
do I get notified, it also creates a fake impression that all these
packages had at least one maintainer when in practice they had none.
2019-12-05 16:29:48 +09:00
Frederik Rietdijk
10d0c68a9b
Merge staging-next into staging
2019-11-20 10:02:21 +01:00
Frederik Rietdijk
65edeb8633
Merge master into staging-next
2019-11-20 10:01:49 +01:00
Tom Hall
801e8b4d72
Allow ffmpeg attributes to be overridden
...
Switch the order in which the version-specific attributes are combined
with args. Otherwise, if args such as 'branch' are overridden by an
overlay or other derivation, the new value is replaced with the
original when the sets are combined with //.
2019-11-18 23:13:59 +01:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined
2019-11-18 20:10:43 +00:00
Timothy DeHerrera
30e428c96c
ffmpeg: add options for QuickSync and libaom AV1
...
Allow users to optionally compile with support for Intel's QuickSync
hardware accelerated encoding, and libaom AV1 encoding. Set to false by
default.
2019-11-12 14:42:58 +01:00
Peter Simons
409ff06407
Merge pull request #67790 from ivan/mpv-ffmpeg-runpath
...
mpv, ffmpeg: use addOpenGLRunpath to fix CUDA-accelerated playback
2019-09-16 20:10:18 +02:00
Vladimír Čunát
260761649b
ffmpeg_4, ffmpeg_full: 4.2 -> 4.2.1
...
Fixes #68561 CVE-2019-15942.
2019-09-14 20:15:26 +02:00
volth
7b8fb5c06c
treewide: remove redundant quotes
2019-09-08 23:38:31 +00:00
Ivan Kozik
46cbb8453a
mpv, ffmpeg: use addOpenGLRunpath to fix CUDA-accelerated playback
...
This fixes #67780 .
Currently, using `mpv --hwdec=nvdec --msg-level=vd=debug` on NVIDIA results in:
```
[vd] Opening decoder hevc
[vd] Looking at hwdec hevc-nvdec...
Cannot load libcuda.so.1
[vd] Could not create device.
[vd] No hardware decoding available for this codec.
```
With just mpv patched, ffmpeg cannot load libnvcuvid.so.1:
```
[vd] Opening decoder hevc
[vd] Looking at hwdec hevc-nvdec...
[vd] Trying hardware decoding via hevc-nvdec.
[vd] Selected codec: hevc (HEVC (High Efficiency Video Coding))
[vd] Pixel formats supported by decoder: vaapi_vld cuda yuv420p10le
[vd] Codec profile: Main 10 (0x2)
[vd] Requesting pixfmt 'cuda' from decoder.
[ffmpeg/video] hevc: Cannot load libnvcuvid.so.1
[ffmpeg/video] hevc: Failed loading nvcuvid.
[ffmpeg/video] hevc: Failed setup for format cuda: hwaccel initialisation returned error.
```
With both mpv and ffmpeg patched, it works:
```
[vd] Opening decoder hevc
[vd] Looking at hwdec hevc-nvdec...
[vd] Trying hardware decoding via hevc-nvdec.
[vd] Selected codec: hevc (HEVC (High Efficiency Video Coding))
[vd] Pixel formats supported by decoder: vaapi_vld cuda yuv420p10le
[vd] Codec profile: Main 10 (0x2)
[vd] Requesting pixfmt 'cuda' from decoder.
Using hardware decoding (nvdec).
[vd] Decoder format: 3840x2160 cuda[p010] bt.2020-ncl/bt.2020/pq/limited/auto SP=10.000000 CL=unknown (auto 0.000000/0.000000/0.000000)
```
2019-09-06 23:18:26 +00:00
Niklas Hambüchen
9e78f76ade
treewide: Remove unnecessary --disable-static ( #66759 )
...
* freetype: Remove unnecessary `--disable-static`.
The true-by-default `dontDisableStatic` already takes care of it.
Fixes freetype not being overridable to have static libs.
* treewide: Remove unnecessary `--disable-static`.
The true-by-default `dontDisableStatic` already takes care of it.
Fixes these packages not being overridable to have static libs.
2019-08-31 08:10:53 -04:00
Michael Weiss
aed9694829
ffmpeg_4: Enable support for AV1 decoding via dav1d by default
...
This is e.g. required for mpv (depends on ffmpeg_4) to play AV1 videos.
Fixes #54990 .
But since dav1d is only a AV1 decoder this doesn't support AV1 encoding
as well (that would require an additional dependency on libaom).
The dependency on dav1d can be disabled by overriding it to null.
2019-08-25 21:40:10 +02:00
volth
46420bbaa3
treewide: name -> pname (easy cases) ( #66585 )
...
treewide replacement of
stdenv.mkDerivation rec {
name = "*-${version}";
version = "*";
to pname
2019-08-15 13:41:18 +01:00
Michael Weiss
28d637d345
ffmpeg_4: 4.1.4 -> 4.2
...
Changelog: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/4.2:/Changelog
2019-08-10 14:09:22 +02:00
Vladimír Čunát
3e17fe4522
ffmpeg{_4,-full}: 4.1.3 -> 4.1.4 (security)
...
Fixes #64656 CVE-2019-13312 CVE-2019-13390.
2019-07-30 15:31:24 +02:00
Vladimír Čunát
58213cd9ca
Merge #60740 : ffmpeg*: 4.1.2 -> 4.1.3
2019-05-11 11:24:18 +02:00
c0bw3b
9cb260d091
[treewide] delete unused patches
2019-05-04 19:52:24 +02:00
adisbladis
88e5ccd16d
ffmpeg_4: 4.1.2 -> 4.1.3
2019-05-02 16:44:34 +01:00
Frederik Rietdijk
230c67f43b
Merge master into staging-next
2019-04-11 07:50:23 +02:00
ryan4729
49c646cbf7
ffmpeg_4: build with videotoolbox on darwin ( #57743 )
2019-04-11 01:09:45 -04:00
Jan Tojnar
cb1a20499a
Merge branch 'master' into staging
2019-04-05 11:37:15 +02:00
John Ericson
4ccb74011f
Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging
...
There was one conflict in the NixOS manual; I checked that it still
built after resolving it.
2019-04-01 00:40:03 -04:00
Silvan Mosberger
a8e19088da
Merge pull request #54392 from ivan/nv-codec
...
ffmpeg, mpv: enable hardware-accelerated decoding with CUDA
2019-03-29 19:57:13 +01:00
Will Dietz
dfdacfdd8a
ffmpeg: 3.4.5 -> 3.4.6
...
0ac9001ab9
2019-03-29 11:25:28 -05:00
Will Dietz
c537b96890
ffmpeg_4: 4.1.1 -> 4.1.2
...
a7cb7a2e43
2019-03-24 14:20:17 -05:00
Will Dietz
b3171efe3b
ffmpeg: 4.1 -> 4.1.1
...
https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n4.1.1
2019-02-11 17:44:24 -06:00
Ivan Kozik
de8f760fbd
ffmpeg, mpv: enable hardware-accelerated decoding with CUDA
...
NVIDIA users can now use `mpv --hwdec=nvdec` to play videos that the
software decoders cannot keep up with.
2019-02-11 00:32:43 +00:00
Piotr Bogdan
c626c85dce
ffmpeg_0: drop
2019-01-27 00:41:18 +00:00
Piotr Bogdan
8eeecd653d
ffmpeg_1: drop
2019-01-27 00:41:18 +00:00
Will Dietz
2420e96990
ffmpeg{_4,-full}: 4.0.3 -> 4.1
2018-12-28 13:06:20 -06:00
Will Dietz
6ba05c7dac
ffmpeg_3_4: 3.4.4 -> 3.4.5
2018-12-28 13:06:20 -06:00
Will Dietz
d15818f55a
ffmpeg: 4.0.2 -> 4.0.3
...
https://www.ffmpeg.org/download.html#releases
https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n4.0.3
2018-12-28 13:06:20 -06:00
Cole Mickens
b79dc80b2f
ffmpeg: enable libdrm
2018-10-29 05:24:19 -07:00
Vladimír Čunát
56621c016d
ffmpeg: unbreak build of older versions after #46078
...
As in the other cases, I didn't care about passing the dependency
if unused...
2018-10-02 11:18:20 +02:00
Jan Malakhovski
6abd75067a
ffmpeg: add support for libssh and speex ( #46078 )
2018-09-05 17:17:01 +02:00
John Ericson
0828e2d8c3
treewide: Remove usage of remaining redundant platform compatability stuff
...
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
Jan Malakhovski
b135329dc5
treewide: random cleanups
2018-08-10 12:56:31 +00:00
Cray Elliott
737fdd7348
ffmpeg_4, ffmpeg-full: 4.0.1 -> 4.0.2
2018-08-01 21:20:14 -07:00
Matthew Harm Bekkema
4f505d7267
ffmpeg: 3.4.3 -> 3.4.4 (bugfix) ( #44267 )
...
Fixes #44256
2018-08-01 15:22:20 +02:00
volth
6d2857a311
[bot] treewide: remove unused 'inherit' in let blocks
2018-07-20 19:38:19 +00:00
Andrew Childs
2d9cc7a3bf
ffmpeg: enable libvpx on Darwin
2018-07-16 18:07:42 +09:00
Vladimír Čunát
ba8cb47905
Merge #43556 : ffmpeg: build fixes
2018-07-15 11:17:18 +02:00
Vladimír Čunát
03e13ab370
ffmpeg_4, ffmpeg-full: 4.0 -> 4.0.1 (security)
...
https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/e049f7c24f:/Changelog
http://ffmpeg.org/security.html claims it fixes CVE-2018-12458..12460
2018-07-15 11:07:03 +02:00
Vladimír Čunát
10cbebe3df
ffmpeg: 3.4.2 -> 3.4.3 (security)
...
https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/89355585366:/Changelog
/cc #42882 : it certainly seems to fix some security issues,
but I'm not sure about mapping to particular CVE numbers;
perhaps it will appear on http://ffmpeg.org/security.html
2018-07-15 11:07:00 +02:00
Andrew Childs
342f72e747
ffmpeg: fix includedir in pkg-config files
2018-07-15 14:53:03 +09:00
Andrew Childs
ad19127009
ffmpeg: fix inverted cross compilation flags
2018-07-15 13:15:24 +09:00
Vladimír Čunát
06b602b192
ffmpeg_2: 2.8.13 -> 2.8.14
...
Lots of bugfixes:
https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/3f8a0d5ad1:/Changelog
2018-06-17 12:13:38 +02:00
John Ericson
f40aa17933
Merge remote-tracking branch 'upstream/master' into staging
2018-05-10 13:29:04 -04:00
xeji
1463480edb
Merge pull request #40289 from yegortimoshenko/mpv-bump
...
mpv: 0.27.2 -> 0.28.2
2018-05-10 18:21:38 +02:00
Yegor Timoshenko
956d174c8d
ffmpeg_4: init
2018-05-10 17:44:40 +03:00
John Ericson
7d8e16d939
Merge pull request #40275 from obsidiansystems/fewer-crossAttrs
...
fontconfig, misc A/V packages: No crossAttrs
2018-05-10 02:17:34 -04:00
John Ericson
7864a17bfb
misc video players: Clean up cross
2018-05-10 01:57:49 -04:00
John Ericson
006422d08d
Merge commit 'feb648ce59ffbed94c58133eb7aa2761992a35e1' into staging
2018-05-10 01:55:26 -04:00
John Ericson
a02be2bd85
treewide: Get rid of *Platform.arch
...
Use `parsed.cpu.name` or `platform.gcc.arch` instead.
2018-05-10 01:37:31 -04:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions
2018-05-02 15:40:38 -05:00
John Ericson
b9acfb4ecf
treewide: isArm -> isAarch32
...
Following legacy packing conventions, `isArm` was defined just for
32-bit ARM instruction set. This is confusing to non packagers though,
because Aarch64 is an ARM instruction set.
The official ARM overview for ARMv8[1] is surprisingly not confusing,
given the overall state of affairs for ARM naming conventions, and
offers us a solution. It divides the nomenclature into three levels:
```
ISA: ARMv8 {-A, -R, -M}
/ \
Mode: Aarch32 Aarch64
| / \
Encoding: A64 A32 T32
```
At the top is the overall v8 instruction set archicture. Second are the
two modes, defined by bitwidth but differing in other semantics too, and
buttom are the encodings, (hopefully?) isomorphic if they encode the
same mode.
The 32 bit encodings are mostly backwards compatible with previous
non-Thumb and Thumb encodings, and if so we can pun the mode names to
instead mean "sets of compatable or isomorphic encodings", and then
voilà we have nice names for 32-bit and 64-bit arm instruction sets
which do not use the word ARM so as to not confused either laymen or
experienced ARM packages.
[1]: https://developer.arm.com/products/architecture/a-profile
(cherry picked from commit ba52ae5048
2018-04-25 15:50:41 -04:00
John Ericson
ba52ae5048
treewide: isArm -> isAarch32
...
Following legacy packing conventions, `isArm` was defined just for
32-bit ARM instruction set. This is confusing to non packagers though,
because Aarch64 is an ARM instruction set.
The official ARM overview for ARMv8[1] is surprisingly not confusing,
given the overall state of affairs for ARM naming conventions, and
offers us a solution. It divides the nomenclature into three levels:
```
ISA: ARMv8 {-A, -R, -M}
/ \
Mode: Aarch32 Aarch64
| / \
Encoding: A64 A32 T32
```
At the top is the overall v8 instruction set archicture. Second are the
two modes, defined by bitwidth but differing in other semantics too, and
buttom are the encodings, (hopefully?) isomorphic if they encode the
same mode.
The 32 bit encodings are mostly backwards compatible with previous
non-Thumb and Thumb encodings, and if so we can pun the mode names to
instead mean "sets of compatable or isomorphic encodings", and then
voilà we have nice names for 32-bit and 64-bit arm instruction sets
which do not use the word ARM so as to not confused either laymen or
experienced ARM packages.
[1]: https://developer.arm.com/products/architecture/a-profile
2018-04-25 15:28:55 -04:00
Jan Malakhovski
7438083a4d
tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part)
2018-04-25 04:18:46 +00:00
Alexander V. Nikolaev
0acec7e984
treewide: transition mesa to libGLU_combined
2018-02-24 17:06:49 +02:00
Cray Elliott
c8aebb699a
ffmpeg, ffmpeg-full: 3.4.1 -> 3.4.2
2018-02-18 09:04:16 -08:00
Will Dietz
22e0a3c1b8
ffmpeg: fix cross compile eval
2018-01-05 18:35:19 -06:00
Cray Elliott
c1e8fea4fc
ffmpeg, ffmpeg-full: 3.4 -> 3.4.1
...
also remove CVE patch, it is upstream in v3.4.1
2017-12-17 23:00:05 -08:00
Vladimír Čunát
8b53b2ec2c
Merge branch 'master' into staging
2017-11-28 21:06:44 +01:00
Andreas Rammhold
2492f45565
ffmpeg-3.4: apply fix CVE CVE-2017-16840
...
Details at [1].
[1] http://git.videolan.org/?p=ffmpeg.git;a=commit;h=a94cb36ab2ad99d3a1331c9f91831ef593d94f74
2017-11-28 00:14:05 +01:00
John Ericson
e755a8a27d
treewide: Use targetPrefix instead of prefix for platform name prefixes
...
Certain tools, e.g. compilers, are customarily prefixed with the name of
their target platform so that multiple builds can be used at once
without clobbering each other on the PATH. I was using identifiers named
`prefix` for this purpose, but that conflicts with the standard use of
`prefix` to mean the directory where something is installed. To avoid
conflict and confusion, I renamed those to `targetPrefix`.
2017-11-27 03:15:50 -05:00
Cray Elliott
5ddea062e2
ffmpeg: 3.3.4 -> 3.4
...
ffmpeg_3 bumped to 3.4, and 3.3.4 removed from the tree
2017-10-23 23:23:23 -07:00
Cray Elliott
739b4091cf
ffmpeg, ffmpeg-full: 3.3.3 -> 3.3.4
2017-09-14 15:06:47 -07:00
Franz Pletz
85cffcfce0
ffmpeg_2_8: 2.8.11 -> 2.8.13
2017-09-05 14:24:59 +02:00
Tuomas Tynkkynen
9f2f74d9bc
ffmpeg: Add man output
2017-08-11 21:32:53 +03:00
Cray Elliott
2f9724e804
ffmpeg, ffmpeg-full: 3.3.2 -> 3.3.3
2017-08-07 12:53:48 -07:00
John Ericson
38dbd4b161
ffmpeg: Don't use stdenv.cross
2017-06-28 18:21:06 -04:00
John Ericson
594d264205
cross stdenv adaptor: Support --host --build --target across the board
...
Packages get --host and --target by default, but can explicitly request
any subset to be passed as needed. See docs for more info.
rustc: Avoid hash breakage by using the old (ignored)
dontSetConfigureCross when not cross building
2017-06-22 17:52:28 -04:00
Martin Wohlert
d402df022f
ffmpeg{,-full}: 3.3.1 -> 3.3.2
...
6d7192bcb7
2017-06-10 19:49:52 +02:00
Cray Elliott
dc12cd1cae
ffmpeg: fix sha256 hash for 3.3.1
...
ffmpeg-full uses the .xz source release while ffmpeg uses .bz2 so hashes
cannot be shared between them
2017-05-23 20:46:10 -07:00
Cray Elliott
39e042fd64
ffmpeg: 3.3 -> 3.3.1
...
ffmpeg-full: 3.3 -> 3.3.1
2017-05-23 18:17:53 -07:00
Nikolay Amiantov
6679dbbd60
ffmpeg: fix arm build
2017-05-19 02:29:49 +03:00
