Daiderd Jordan
00b05d47d3
ffmpeg: add extra darwin framework for 3.1
2016-08-07 12:27:05 +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
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
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
Vladimír Čunát
4a571ba0dd
ffmpeg: split into multiple outputs
...
Also fix some referrers.
2015-10-13 20:18:57 +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
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