mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 15:11:35 +00:00
Code Issues Wiki Activity
88907 commits 249 branches 124 tags 7.1 GiB
Commit graph

141 commits

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