Commit graph

79 commits

Author SHA1 Message Date
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