alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
239318 commits 217 branches 121 tags 4.5 GiB
Commit graph

259 commits

Author SHA1 Message Date
zowoq ba4f0c63e4
ffmpeg: 4.3 -> 4.3.1 
(cherry picked from commit 916bc99f2c)
See the grandparent commit.
 2020-07-18 18:02:24 +02:00
zowoq b9f891960e
ffmpeg_3_4: 3.4.7 -> 3.4.8 
(cherry picked from commit 88c720f0bf)
See the parent commit.
 2020-07-18 18:02:23 +02:00
zowoq 6af12c3339
ffmpeg_2_8: 2.8.16 -> 2.8.17 
(cherry picked from commit 92cfd28d2b)
The ffmpeg updates aren't build rebuilds, so I forward-pick them
from staging to master.  I suspect they have important fixes.
Originally from PR #93217.
 2020-07-18 18:02:22 +02: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.

This change was accidentally commit to master. To avoid a mass-rebuild we
actually apply this change on staging first.
 2020-01-04 08:26:03 +00:00
Jörg Thalheim 7d46f7363c
Revert "ffmpeg: fix cross compilation" 
This reverts commit f6f8f0b75a.

avoid mass-rebuild on master; move to staging instead.
 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.

avoid mass-rebuild on master; move to staging instead.
 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:/Changelog
 2019-03-29 11:25:28 -05:00
Will Dietz c537b96890 ffmpeg_4: 4.1.1 -> 4.1.2 
a7cb7a2e43:/Changelog
 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