JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
133,801 Commits 2 Branches 0 Tags 13 GiB
90cfaf1ab3
Commit Graph

178 Commits

Author SHA1 Message Date
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
Franz Pletz
571f5b74ed ffmpeg: 2.8.5 -> 2.8.6 (CVE-2016-2329) 2016-02-27 16:34:02 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Vladimír Čunát
620c147cce Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00
Vladimír Čunát
4a097fdc3f ffmpeg-2.2: remove this vulnerable branch 
Upstream doesn't maintain it anymore and it's unused in nixpkgs.
/cc #12437.
 2016-01-17 11:45:10 +01:00
Vladimír Čunát
85628148de ffmpeg(-2.8): security update to fix #12437 
2.8.5 is claimed to fix CVE-2016-{1897,1898}.
 2016-01-17 09:56:32 +01:00
Luca Bruno
e289717414 rename moveToOutput and propagatedBuildInputs 2015-12-02 10:05:36 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
William A. Kennington III
dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Jude Taylor
9b4ba3c5da style fix in ffmpeg expression 2015-10-30 11:40:35 -07:00
Asko Soukka
aa12640cb9 darwin: ffmpeg: add needed inputs 2015-10-30 11:40:35 -07:00
Andrew Kelley
fb1e994c0c ffmpeg: 2.7.2 -> 2.8.1 (close #10396) 
@vcunat removed 2.7 and 2.6. The global version of 2.6 was unused,
and 2.7 -> 2.8 switch should be without problems by inspecting
http://abi-laboratory.pro/tracker/timeline/ffmpeg/
(only ABI changes and symbol additions)
 2015-10-15 21:07:00 +02:00
Vladimír Čunát
4a571ba0dd ffmpeg: split into multiple outputs 
Also fix some referrers.
 2015-10-13 20:18:57 +02:00
Andrew Kelley
9dd6f4f6ce ffmpeg: 2.7.1 -> 2.7.2 2015-08-28 22:08:43 -07:00
Andrew Kelley
1fdd432ffa ffmpeg: 2.6.3 -> 2.7.1 2015-07-08 17:03:49 -07:00
Vladimír Čunát
69945a8701 ffmpeg: remove 0.11 and replace by 0.10 
That branch is better supported, and 0.11 only had one user -
minidlna still builds
 2015-06-11 21:36:14 +02:00
William A. Kennington III
b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
codyopel
ec8babb4fd ffmpeg: include networking support 
add networking support to the default build, required by mpv
 2015-05-28 07:39:10 -04:00
codyopel
61fa78293d ffmpeg(-full): 2.6.2 -> 2.6.3 2015-05-20 20:45:59 -04:00
codyopel
a35ef4e3df ffmpeg: update branches 
ffmpeg_0_10: 0.10.15 -> 0.10.16
ffmpeg_2_2: 2.2.13 -> 2.2.15
ffmpeg_2_6: 2.6.1 -> 2.6.2
ffmpeg-full: 2.6.1 -> 2.6.2
 2015-05-16 20:23:25 -04:00
Eric Seidel
662a6b1ca6 remove all references to stdenv.cc.cc.is{GNU,Clang} 
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
 2015-05-11 14:44:50 -07:00
codyopel
033472c136 ffmpeg: refactor, ffmpeg -> ffmpeg-full & add ffmpeg (minimal) 
+ adds a minimal dependency version of ffmpeg as the default
+ the current ffmpeg changes have been moved to ffmpeg-full
+ ffmpeg default 2.5 -> 2.6
+ removed ffmpeg 0.5 & 2.5 (unused versions)

Close #7160.
 2015-04-07 14:53:18 +02:00
Eelco Dolstra
3779aa07f5 ffmpeg: Reduce dependency bloat 
It was depending on Qt, MariaDB and PostgreSQL (via v4l-utils),
causing the closure size to explode from 475 MB to 1.3 GB.

http://hydra.nixos.org/job/nixpkgs/trunk/ffmpeg.x86_64-linux#tabs-charts

Also disabled a bunch of other mostly obscure dependencies.
 2015-04-01 13:31:05 +02:00
codyopel
a5f065d708 ffmpeg: improve cross platform support & fix licensing issues, resolves #7013 
+ Removed asserts for (l)gpl & (l)gpl3 making it easier to enable and disable all
  (l)gpl & (l)gpl3 portions
+ Fix build inputs so that nonfree software isn't pulled in when building ffmpeg
+ Fix compiler on systems with clang
+ Disable libraries that fail on darwin until they can be fixed
+ Fix linux only build inputs so that they aren't pulled in on other platforms
+ Fix optional build inputs
+ Opencv causes circular dependency issues so it is disabled until it can be resolved
 2015-03-29 16:42:42 -04:00
Vladimír Čunát
105f933f64 ffmpeg: add new branch 2.6.1 (no switching yet) 
/cc maintainers @codyopel, @fuuzetsu.

Release notes don't indicate any new options or dependencies.
http://git.videolan.org/?p=ffmpeg.git;a=blob;f=RELEASE_NOTES;hb=release/2.6
APIchanges looks like we should be able to replace 2.5 by 2.6
without anything breaking (belongs to staging and needs some testing).
 2015-03-18 18:10:26 +01:00
Peter Simons
ecad102326 pkgs/development/libraries/ffmpeg/generic.nix: don't insert faac into buildInputs unconditionally 
This is a hot-fix to mitigate https://github.com/NixOS/nixpkgs/issues/6727.
 2015-03-09 12:30:16 +01:00
codyopel
6ed1d9f525 ffmpeg: refactor to generic 
* migrate some branches from ffmpeg.config.<optional>, now allows version specific configuration
* Added optionals for most features
* Added qt-faststart executable
* Licensing corrections
* Added dependencies
    + celt
    + faad2
    + flite
    + frei0r-plugins
    + fribidi
    + game-music-emu
    + gsm
    + jack2
    + ladspa-sdk
    + libavc1394
    + libbluray
    + libbs2b
    + libcaca
    + libmodplug
    + libogg
    + libraw1394
    + libssh
    + libwebp
    + libxcb
    + lzma
    + openal
    + opencl
    + opengl
    + openh264
    + openjpeg
    + openssl
    + pulseaudio
    + rtmpdump
    + samba
    + soxr
    + v4l-utils
    + vid.stab
    + wavpack
    + libX11
    + libXv
    + wavpack
    + x265
    + xavs
    + xvidcore
    + zeromq
* Outlines support for: (unpackaged/broken dependencies)
    + aacplus
    + avisynth
    + crystalhd
    + blackmagic-design-desktop-video
    + flite
    + ilbc
    + libavc1394
    + libcdio-paranoia
    + libiec61883
    + libmfx
    + libnut
    + nvenc (nvidia)
    + opencl
    + opencore-amr
    + openh264
    + oss
    + libquvi
    + schroedinger
    + shine
    + twolame
    + utvideo
    + vo-aacenc
    + vo-amrwbenc
    + zvbi
 2015-02-28 12:12:25 -05:00
Nathaniel Baxter
798a42a3ee ffmpeg: update 2.5.3 to 2.5.4 2015-02-22 11:58:48 +11:00
Vladimír Čunát
474aeb0b3d ffmpeg-2.2: update (still used by vlc) 2015-02-05 11:19:18 +01:00
Mateusz Kowalczyk
7db3f7ada6 ffmpeg: update from 2.5.1 to 2.5.3, potentially fixes CVE-2014-9602, CVE-2014-9603, CVE-2014-9604 2015-01-23 19:41:27 +00:00
Vladimír Čunát
eb611fa890 ffmpeg: maintenance update 2.5 -> 2.5.1 2014-12-16 21:39:18 +01:00
Vladimír Čunát
304484a753 ffmpeg_2_3: use 2.2 instead of 2.3 
2.3 branch is unmaintained and was critically vulnerable (I thank to monitor).
 2014-12-16 21:33:24 +01:00
Mateusz Kowalczyk
b13301ecbe ffmpeg: update from 2.4.4 to 2.5 (close #5279) 2014-12-10 18:13:53 +01:00
Mateusz Kowalczyk
41e2ba7bbf ffmpeg: update from 2.4.3 to 2.4.4 2014-12-03 16:52:46 +00:00
Rüdiger Sonderfeld
b023a0bdfb ffmpeg/1.x: Update to 1.2.10 (close #5215) 2014-12-03 16:37:11 +01:00
Mateusz Kowalczyk
9b507ccf02 ffmpeg: 2.4.2 -> 2.4.3 2014-11-03 16:56:03 +00:00
William A. Kennington III
8ad2a13bdf ffmpeg: 1.2.8 -> 1.2.9 2014-10-17 14:26:44 -07:00
Mateusz Kowalczyk
23fbed1fef ffmpeg: update from 2.4.1 to 2.4.2 2014-10-06 17:36:40 +01:00
Mateusz Kowalczyk
76f07fbafc ffmpeg-1: meta.branch 2014-09-30 11:13:43 +01:00
Mateusz Kowalczyk
0f485bd0db ffmpeg_0_10: update from 0.10.14 to 0.10.15 
cc @lovek323
 2014-09-30 11:13:37 +01:00
Mateusz Kowalczyk
07e2be6c29 ffmpeg-0.6: branch info 2014-09-30 10:33:15 +01:00
Mateusz Kowalczyk
aafca4dd51 Add a few meta.branch to please monitor 2014-09-30 10:07:49 +01:00
Nathaniel Baxter
859918d235 vlc: Add ffmpeg version 2.3.x for vlc. 
Vlc doesn't support libavcodec >= 56 yet, which means it needs an older
version of ffmpeg.

Closes #4286
 2014-09-27 01:04:38 +01:00
Mateusz Kowalczyk
d6821cc9a8 ffmpeg: update from 2.3.3 to 2.4.1 2014-09-26 06:29:07 +01:00
Moritz Ulrich
332395b262 Add myself as a maintainer to a bunch of packages. 2014-09-04 17:05:21 +02:00
Moritz Ulrich
439ebda62a ffmpeg_1: update from 1.2.7 to 1.2.8 2014-09-04 17:05:20 +02:00
Mateusz Kowalczyk
98cc03eb22 ffmpeg: update to 2.3.3 2014-08-29 13:05:09 +01:00
Vladimír Čunát
3310c8b507 ffmpeg: maintenance update 2014-08-14 22:28:46 +02:00
Eelco Dolstra
8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Vladimír Čunát
6b4929373f ffmpeg: major update 2.2.4 -> 2.3 
It's claimed to be fully API-compatible update.
 2014-07-20 08:44:58 +02:00
Vladimír Čunát
07a09fbe63 ffmpeg{_2,_1,_0_10}: minor update 2014-06-30 21:00:36 +02:00
Jason "Don" O'Conal
bcc36ee23e mpd: fix build on darwin 2014-05-21 15:50:15 +10:00
Chris Double
30c3b81cc2 Update ffmpeg to 2.2.2 2014-05-08 00:52:38 +12:00
Sterling Stein
63b3cf669b Add subtitle option for ffmpeg. 2014-04-25 20:13:12 -07:00
Thomas Tuegel
922e4f3858 ffmpeg 2.1.4 -> 2.2.1 2014-04-16 07:49:51 -05:00
Vladimír Čunát
da4fca4ce4 ffmpeg (0.10): minor update 
(cherry picked from commit 9951478c40330b7cf7918ce93c7d242d99ffcd05)

Conflicts:
	pkgs/development/libraries/ffmpeg/0.10.nix
 2014-03-17 22:56:19 +01:00
Evgeny Egorochkin
0047f42663 ffmpeg_1: update from 1.2.4 to 1.2.6 2014-03-08 18:32:13 +02:00
Evgeny Egorochkin
bc1c6df9fe ffmpeg_0_10: update from 0.10.10 to 0.10.11 2014-03-08 18:30:44 +02:00
Vladimír Čunát
765e119b33 ffmpeg_2: update 2.1.1 -> .4, fixing CVE-2014-209{7,8,9} 2014-03-05 21:33:56 +01:00
Lluís Batlle i Rossell
3faf620e8a Updating libvpx to 1.3.0, and making ffmpeg include vpx 
I don't think there is any reason not to have vpx there. It's
part of webm.
 2014-01-20 13:47:24 +01:00
Lluís Batlle i Rossell
cb35bf15a4 ffmpeg: adding gnutls support 
I also take out the useless 'openssl' I added by error to mpv.
 2014-01-15 17:04:14 +01:00
Eelco Dolstra
20ab977736 ffmpeg: configurable.nix -> 2.x.nix 2014-01-07 15:36:00 +01:00
Thomas Tuegel
90c99bab59 ffmpeg: make fdk-aac support configurable 2014-01-05 09:02:47 -06:00
Thomas Tuegel
eb1e109b51 ffmpeg: add configurable 2014-01-05 09:02:46 -06:00
Mathijs Kwik
e3acde0b44 ffmpeg: switch to default versioning-scheme 2013-12-23 11:03:09 +01:00
Mathijs Kwik
8e85e17a99 ffmpeg-1: upgrade to 1.2.4 2013-12-23 10:25:14 +01:00
Mathijs Kwik
2de160c594 ffmpeg-0.10: upgrade to 0.10.10 2013-12-23 10:25:14 +01:00
Lluís Batlle i Rossell
142298495e Fixing the Ultrastardx build. Not tested if it works and how. 2013-12-07 00:07:35 +01:00
Lluís Batlle i Rossell
ad90f2f0b8 Adding ffmpeg 2.x 2013-12-04 21:04:30 +01:00
Lluís Batlle i Rossell
6f4c08b0b7 Adding fontconfig support to ffmpeg. 2013-11-27 12:37:59 +01:00
Lluís Batlle i Rossell
bf48a6f3d6 Adding freetype to ffmpeg. To use the drawtext filter. 2013-11-24 14:57:54 +01:00
Jonas Hoersch
b0976dcdfc ffmpeg_1: update to version 1.2.3 2013-09-16 07:01:36 +02:00
Jason \"Don\" O'Conal
735555d86f ffmpeg: fix build on darwin 
* build with gccApple
* don't delete '*.a' files when building xvidcore
 2013-07-12 16:26:44 +02:00
Mathijs Kwik
f7b3032da7 ffmpeg-1.x: passthrough vdpauSupport 2013-06-27 21:35:22 +02:00
Mathijs Kwik
7f413e4d5c whitespace cleaning 2013-06-27 21:35:21 +02:00
Lluís Batlle i Rossell
d0d4e66652 ffmpeg: update to 1.2 (and patching mplayer2) 
Simple patch required by mplayer2 to build with ffmpeg 1.2.
 2013-04-04 23:07:23 +02:00
Lluís Batlle i Rossell
12409aa7cb ffmpeg: adding manpage generation 2013-04-04 22:11:09 +02:00
Lluís Batlle i Rossell
39be94cb68 ffmpeg: enabling ffplay 
Playing sound, it displays great ffts.
 2013-03-20 22:20:51 +01:00
Lluís Batlle i Rossell
a799b8ef5d ffmpeg: add opus support, enabled by default 2013-03-20 22:20:51 +01:00
Lluís Batlle i Rossell
2f39e18b7f ffmpeg: update 1.1 to 1.1.3 2013-03-09 13:56:46 +01:00
Eelco Dolstra
674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Mathijs Kwik
4d4b045d95 ffmpeg: remove unused 1.0 version 2013-03-04 22:26:13 +01:00
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Lluís Batlle i Rossell
10e12b76a5 ffmpeg 1.1: building libavresample 
It's disabled by default, but mplayer2 requires it (still).
 2013-01-31 00:24:24 +01:00
Lluís Batlle i Rossell
111b203467 Updates related to VAAPI/VDPAU 
Making ffmpeg link to libva.
Add the vdpau driver for vaapi.
 2013-01-29 01:10:00 +01:00
Eelco Dolstra
5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Lluís Batlle i Rossell
982dd693b3 Adding ffmpeg 1.1 
Moving packages using 1.0 to using 1.1. Vlc built fine here.
 2013-01-14 00:41:01 +01:00
Jan Malakhovski
33ea74f9b6 ffmpeg: show vdpauSupport to the world 2013-01-05 23:33:50 +01:00
Lluís Batlle i Rossell
a72f66aded ffmpeg 1.0: adding alsa support 2013-01-03 19:45:20 +01:00
Cillian de Róiste
471eb0ba53 ffmpeg: Add option to enable x11grab support. 
This is useful for making screencasts, or bug reporting.

Note: This is copied from aszlig's pull request: 05831d3a66
 2012-09-30 23:53:39 +02:00
Lluís Batlle i Rossell
cb7e161361 ffmpeg: adding 1.0 back as an attribute apart. 2012-09-30 12:20:55 +02:00
Lluís Batlle i Rossell
3bc6675d70 Revert "ffmpeg: update to 1.0" 
This reverts commit 8ea11ec677.

It was breaking things, as said by Eelco said in nix-dev:
http://hydra.nixos.org/eval/742774
 2012-09-30 12:19:37 +02:00
Lluís Batlle i Rossell
8ea11ec677 ffmpeg: update to 1.0 2012-09-29 23:37:05 +02:00
Eelco Dolstra
63b257e0e1 Revert "ffmpeg: Update to latest version 0.11.1." 
This reverts commit c6a2a1f885.
 2012-07-24 11:43:31 -04:00
Eelco Dolstra
bb8ac70291 Revert "ffmpeg: Add option to enable x11grab support." 
This reverts commit 05831d3a66.
 2012-07-24 11:43:30 -04:00
Eelco Dolstra
605f9bec52 Revert "ffmpeg: Add alsaLib to dependencies." 
This reverts commit d9f08cf6f2.
 2012-07-24 11:43:29 -04:00
Eelco Dolstra
bf4c4d7a36 Revert "ffmpeg: Add optional Jack audio support." 
This reverts commit fe42f8add9.
 2012-07-24 11:43:24 -04:00
Cillian de Róiste
fe42f8add9 ffmpeg: Add optional Jack audio support. 
The author of this commit is @cillianderoiste because he made the patch and I'm
just committing it.

This change adds support for Jack audio "while we're at it", see discussion at
pull request #54.
 2012-07-19 04:37:33 +02:00
aszlig
d9f08cf6f2 ffmpeg: Add alsaLib to dependencies. 
As @cillianderoiste pointed out, it makes sense to have this in, not only to
record audio while grabbing the display. This is not optional in this case, as
it isn't a compile time option either. And on the other hand, having ffmpeg
running with OSS doesn't appear reasonable to me, as ffmpeg will fall back to
OSS if alsa isn't available anyway.
 2012-07-18 17:27:24 +02:00