JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,726 Commits 2 Branches 0 Tags 12 GiB
5097e84a9d
Commit Graph

176 Commits

Author SHA1 Message Date
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:/Changelog
 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
Daiderd Jordan
0ffe146ed3
ffmpeg: remove darwin patch 2017-05-01 13:31:00 +02:00
Cray Elliott
fe3590b5ba remove ffmpeg_3_2 and ffmpeg_3_1 2017-04-30 16:52:48 -07:00
Cray Elliott
dfd371de9b ffmpeg: use SDL2 instead of SDL for 3.2 and above 
addresses issue #24658

special thanks to codyopel who suggested this solution!
 2017-04-30 16:52:48 -07:00
Cray Elliott
7172556e8d ffmpeg: 3.2.4 -> 3.3 2017-04-30 16:52:48 -07:00
Franz Pletz
e8af5dcd8e
ffmpeg: 3.2.2 -> 3.2.4 for multiple CVEs 
Fixes CVE-2017-5024 & CVE-2017-5025.

See https://ffmpeg.org/security.html.
 2017-02-15 09:35:28 +01:00
Franz Pletz
d2426f0aa8
ffmpeg: 3.1.6 -> 3.1.7 for multiple CVEs 
Fixes CVE-2017-5024 & CVE-2017-5025.

See https://ffmpeg.org/security.html.
 2017-02-15 09:35:27 +01:00
Franz Pletz
78f59f1223
ffmpeg: 2.8.10 -> 2.8.11 for multiple CVEs 
Fixes CVE-2017-5024 & CVE-2017-5025.

See https://ffmpeg.org/security.html.
 2017-02-15 09:35:27 +01:00
Graham Christensen
16f8f0d313
ffmpeg_3: 3.1.4 -> 3.1.6 2017-02-02 08:47:01 -05:00
Vladimír Čunát
6edc9788f5
ffmpeg_2_8: maintenance 2.8.8 -> 2.8.10 2017-01-26 14:13:30 +01:00
Stefan Götz
9280174493 mpv: 0.22.0 -> 0.23.0 2017-01-10 22:42:29 +01:00
Tomas Hlavaty
20f138c3d7 ffmpeg: respect sdlSupport option 2016-12-13 22:37:06 +01:00
Graham Christensen
2f7bdfe97e
ffmpeg: 3.1.3 -> 3.1.4 2016-10-19 08:48:11 -04:00
Graham Christensen
561741a9d4
ffmpeg: 2.8.7 -> 2.8.8 2016-09-23 20:22:01 -04:00
Vladimír Čunát
853e230fca ffmpeg_2: 2.8.6 -> 2.8.7 2016-09-10 11:33:18 +02:00
Dmitry Kalinkin
e7afac83c9 ffmpeg3: fix darwin build (#18350) 2016-09-06 10:58:34 +02:00
Tuomas Tynkkynen
8c4aeb1780 Merge staging into master 
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
 2016-09-01 13:27:27 +03:00
Zero King
e35bbf108a ffmpeg: 3.1.2 -> 3.1.3 2016-08-30 09:06:18 +00:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs 
Make either 'bin' or 'out' the first output.
 2016-08-29 14:49:51 +03:00
Zero King
f7823dde4f ffmpeg: 3.1.1 -> 3.1.2 2016-08-26 09:05:43 +00:00
Daiderd Jordan
00b05d47d3
ffmpeg: add extra darwin framework for 3.1 2016-08-07 12:27:05 +02:00
Vladimír Čunát
cd04b83605 ffmpeg_3: 3.0.2 -> 3.1.1 2016-07-09 11:43:25 +02:00
Vladimír Čunát
cbca34b1a7 Merge #13977: ffmpeg: add 3.0 version 
I made the default not change for now.
 2016-06-09 14:11:30 +02:00
Vladimír Čunát
9876769698 ffmpeg_3: 3.0 -> 3.0.2 2016-06-09 14:06:18 +02:00
Franz Pletz
28e051f066
ffmpeg: add patches for libvpx 1.5 
ffmpeg bug report: https://trac.ffmpeg.org/ticket/4956
ffmepg fix commit: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab
 2016-05-17 01:02:30 +02:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size 
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
 2016-04-10 11:17:52 +02:00
Nikolay Amiantov
cae349102e ffmpeg: install man pages 2016-04-09 14:03:27 +03:00
Nikolay Amiantov
d023e15cfc ffmpeg: enable x265 support 2016-04-09 14:02:43 +03:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
Domen Kožar
b1a8ae2a35 ffmpeg: fix bad merge 2016-03-27 13:31:04 +01:00
Domen Kožar
b07e7bfc7b Merge remote-tracking branch 'origin/staging' 2016-03-27 13:19:04 +01:00
Nikolay Amiantov
e781a8257b ffmpeg: add libopus support 2016-03-26 17:09:59 +03:00
Lluís Batlle i Rossell
bd58b895e0 Making ffmpeg friendly for arm. 2016-03-22 15:09:59 +01:00
Andrew Kelley
140e48f3c1 ffmpeg: 2.8.5 -> 3.0 2016-03-16 16:09:22 -07:00
Vladimír Čunát
09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00