Commit Graph

7 Commits

Author SHA1 Message Date
Aristid Breitkreuz
365fd9efeb use gnutls rtmpdump for ffmpeg, as it doesnot build otherwise 2015-05-03 11:47:25 +00:00
Joachim Fasting
8488d133f3 meta.licenses -> license 2015-04-21 23:10:07 +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