Commit Graph

40 Commits

Author SHA1 Message Date
Vladimír Čunát
48f1d9c483 libav: fixup build after e9cce6d
Fixes #16411. The patch wasn't applied anymore.
2016-06-22 10:25:06 +02:00
Lluís Batlle i Rossell
e9cce6db44 Updating libav from 11.6 to 11.7. 2016-06-18 15:16:58 +02:00
Christian Albrecht
fd294521e6
libav: 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:01:55 +02: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
Tobias Geerinckx-Rice
9ba1afb94b libav: drop unused version 9. 2016-03-21 18:28:08 +01:00
Vladimír Čunát
07a3d42023 libav: minor updates 11.4 -> 11.6
The older branches seem unmaintained and better not used -
/cc maintainer of keyfinder @nckx.
2016-03-21 09:57:09 +01:00
Vladimír Čunát
02b13f7bdb libav: fixup sandboxed builds after parent commit 2016-03-21 09:56:25 +01:00
Ryan Artecona
f3f8da4a5f libav: support Darwin & install docs/manpages 2016-03-20 17:42:34 -04:00
Luca Bruno
e289717414 rename moveToOutput and propagatedBuildInputs 2015-12-02 10:05:36 +01:00
Vladimír Čunát
17b86fef1e libva: build a lighter version by default
Mesa, X etc. are not very light dependencies.
This will also allow us to break the cycle with mesa.
2015-10-28 14:15:44 +01:00
Vladimír Čunát
d0f72e729a libav: fix with multiple outputs and improve splitting 2015-10-04 11:29:37 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Vladimír Čunát
c86c1b79af libav(-11): maintenance update, including security 2015-06-02 11:02:11 +02:00
Vladimír Čunát
bf414c9d4f Merge 'staging' into closure-size
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Vladimír Čunát
07e49e6952 libav*: maintenance updates, including security 2015-03-12 20:15:22 +01:00
Vladimír Čunát
cdd00f47fa libav*.tools: remove overlapping paths, fixes #6682 2015-03-06 12:55:08 +01:00
Vladimír Čunát
c8f2a31de3 libav-11: maintenance update, including security
CVE-2014-{8541,8542,8543,8547,8548,8549}
2015-02-22 21:32:31 +01:00
Vladimír Čunát
6a63d1e1e1 libav: replace default 10 branch by the new 11
Upstream claims the upgrade is API-compatible.
That is why I decided to drop the 10 branch completely.
2014-09-13 21:48:11 +02:00
Vladimír Čunát
ead6603b60 libav: update all branches, probably with security fixes 2014-09-13 21:05:16 +02:00
Vladimír Čunát
8da52a642a Merge branch 'staging' into v/modular
Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
2014-08-31 12:23:18 +02:00
Vladimír Čunát
381dcb1d98 various packages fixed 2014-08-30 23:30:31 +02:00
Vladimír Čunát
fccf486762 libav: maintenance+security update
CVE-2013-{0848,3672,3674,7020} and CVE-2014-{2098,2263}
2014-08-30 10:17:40 +02:00
Vladimír Čunát
ed21770eca libav_9: maintenance update, including CVE fixes
Updated libav_0_8 would fail to build.
2014-08-10 18:29:03 +02:00
Vladimír Čunát
52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +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
9a5adb93d4 libav: maintenance + security update
Supposed to fix CVE-2011-3946 and CVE-2013-{0851,0852,0868}.
2014-08-04 21:11:35 +02:00
Vladimír Čunát
ddcc163711 libav: maintenance updates of all three branches
(cherry picked from commit c61c7e7313)
2014-07-31 16:30:04 +02:00
Vladimír Čunát
c61c7e7313 libav: maintenance updates of all three branches 2014-06-28 08:16:36 +02:00
Vladimír Čunát
77abe5e464 libav: update 0.8.11 -> .12, 9.12 -> .13, introduce 10.1 2014-06-04 10:37:59 +02:00
Eelco Dolstra
255a6a9da8 libav: Disable tests
These appear to fail randomly sometimes:

http://hydra.nixos.org/build/10854615
2014-05-07 14:02:25 +02:00
Vladimír Čunát
76822ea4d5 libav: minor updates of both branches 2014-03-16 17:45:48 +01:00
Vladimír Čunát
3fe1656376 libav: bugfix updates for both branches; maintain 2014-02-03 21:43:55 +01:00
Nixpkgs Monitor
c0536e306c libav_0_8: update from 0.8.8 to 0.8.9 2013-12-18 18:18:33 +02:00
Vladimír Čunát
d269ab1579 libav: maintenance update 9.9 -> 9.10 2013-10-12 19:37:27 +02:00
Vladimír Čunát
ea8a7bcd0c libav: update 9.8 -> 9.9
It's supposed to include some security-related fixes.
2013-09-10 10:42:33 +02:00
Vladimír Čunát
c7187ad59f libav: major update and refactoring (close #839)
Also leaving 0_8 branch, as it's compatible with older ffmpeg versions.
I'm planning that all expressions will be able to switch easily
between ffmpeg and libav (whatever default we choose, but I prefer libav).

Edited (twice) according to notes on the reverted b003138.
2013-08-26 18:02:33 +02:00
Eelco Dolstra
6175954271 Revert "libav: major update and refactoring"
This reverts commit b003138081 because
it breaks Nixpkgs evaluation with "error: attribute `cross.config'
missing".

http://hydra.nixos.org/build/5725600
2013-08-16 13:39:02 +02:00
Vladimír Čunát
b003138081 libav: major update and refactoring
Also leaving 0_8 branch, as it's compatible with older ffmpeg versions.
I'm planning that all expressions will be able to switch easily
between ffmpeg and libav (whatever default we choose, but I prefer libav).
2013-08-13 20:08:26 +02:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Eelco Dolstra
56a081cd55 * Added libav, a fork of ffmpeg.
svn path=/nixpkgs/trunk/; revision=27797
2011-07-15 12:20:34 +00:00