Commit Graph

40 Commits

Author SHA1 Message Date
Vladimír Čunát
8b53b2ec2c
Merge branch 'master' into staging 2017-11-28 21:06:44 +01:00
Andreas Rammhold
fe1f228580
ffmpeg-full-3.4: apply patch for CVE-2017-16840 2017-11-28 18:41:53 +01:00
John Ericson
e755a8a27d treewide: Use targetPrefix instead of prefix for platform name prefixes
Certain tools, e.g. compilers, are customarily prefixed with the name of
their target platform so that multiple builds can be used at once
without clobbering each other on the PATH. I was using identifiers named
`prefix` for this purpose, but that conflicts with the standard use of
`prefix` to mean the directory where something is installed. To avoid
conflict and confusion, I renamed those to `targetPrefix`.
2017-11-27 03:15:50 -05:00
Anthony Cowley
0744e0d829 ffmpeg-full: fix on darwin 2017-10-31 09:01:02 +01:00
Cray Elliott
5ddea062e2 ffmpeg: 3.3.4 -> 3.4
ffmpeg_3 bumped to 3.4, and 3.3.4 removed from the tree
2017-10-23 23:23:23 -07:00
Cray Elliott
739b4091cf ffmpeg, ffmpeg-full: 3.3.3 -> 3.3.4 2017-09-14 15:06:47 -07:00
kiloreux
7e943b5fdb
Enable opencore-amr in ffmpeg-full 2017-08-09 02:40:36 +01:00
Cray Elliott
2f9724e804 ffmpeg, ffmpeg-full: 3.3.2 -> 3.3.3 2017-08-07 12:53:48 -07:00
Robert Helgesson
f36323c81f
ffmpeg-full: fix path to frei0r filters
Fixes #27555.
2017-07-30 12:52:03 +02:00
John Ericson
38dbd4b161 ffmpeg: Don't use stdenv.cross 2017-06-28 18:21:06 -04:00
John Ericson
594d264205 cross stdenv adaptor: Support --host --build --target across the board
Packages get --host and --target by default, but can explicitly request
any subset to be passed as needed. See docs for more info.

rustc: Avoid hash breakage by using the old (ignored)
dontSetConfigureCross when not cross building
2017-06-22 17:52:28 -04:00
Martin Wohlert
d402df022f ffmpeg{,-full}: 3.3.1 -> 3.3.2
6d7192bcb7:/Changelog
2017-06-10 19:49:52 +02:00
Cray Elliott
3a183888a4 ffmpeg-full: update sha256
it seems a new source archive was uploaded, replacing the old one, as
nix-prefetch-url reports a new hash
2017-05-25 01:49:00 -07:00
Peter Hoeg
4e704b144a ffmpeg: incorrectly updated sha sums broke the build 2017-05-24 11:55:25 +08:00
Cray Elliott
39e042fd64 ffmpeg: 3.3 -> 3.3.1
ffmpeg-full: 3.3 -> 3.3.1
2017-05-23 18:17:53 -07:00
Cray Elliott
fe666125a6 ffmpeg-full: add enableLto option
disabled by default, allows the user to specify if they would like a
link-time optimized build or not
2017-05-18 21:44:59 -07:00
Cray Elliott
5a9850cedd ffmpeg-full: 3.2.4 -> 3.3
remove legacy x11grab and memalign configure option, both removed
as of 3.3
2017-04-30 16:52:48 -07:00
Cray Elliott
5b6b1100f3 ffmpeg-full: replace SDL support with SDL2 support
ffmpeg 3.2 dropped support for SDL1 completely, so migrate to SDL2
2017-04-06 20:13:47 -07:00
Cray Elliott
d2aa1706bd ffmpeg-full: 3.2.2 -> 3.2.4 2017-03-02 02:44:28 -08:00
Graham Christensen
16f8f0d313
ffmpeg_3: 3.1.4 -> 3.1.6 2017-02-02 08:47:01 -05:00
Cray Elliott
35d48f3ba1 ffmpeg-full: 3.1.3 -> 3.2.2
also removed a few flags for features that have been entirely removed from
ffmpeg

removed:
- faac
- aacplus
- incompatibleLibavAbi option

please use fdk-aac or the built-in encoder for your aac audio needs
2017-01-25 18:57:03 -08:00
Anthony Cowley
7b86688923 ffmpeg-full: 3.0.2 -> 3.1.3
This required a minor patch to work with the darwin stdenv on OS X 10.11
and newer.
2016-08-31 19:00:27 -04:00
Lluís Batlle i Rossell
3a61de4e69 Update ffmpeg-full to 3.0.2 2016-06-18 15:16:58 +02:00
Lluís Batlle i Rossell
93912d99d2 Adding nvenc support to ffmpeg (default off)
I add the nvidia-video-sdk header files, required to make it work.

You have to set nvenct=true to ffmpeg-full and nonfreeLicensing=true to
ffmpeg-full to use this.
2016-06-14 17:51:55 +02:00
Anthony Cowley
184a3957e6 ffmpeg-full: avfoundation indev support on darwin
Adds support for camera input devices on OS X.

This required fixing links in output libraries and executables to pull
in the system's CoreFoundation.framework rather than the open source CF
one.
2016-04-15 18:21:33 -04:00
Anthony Cowley
2f6f3c7b55 ffmpeg-full: 2.8.5 -> 3.0
Also changes the homepage URL to https.
2016-03-11 15:14:52 -05: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
William A. Kennington III
9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Stéphane Jourdois
a2bf64a381 darwin: ffmpeg-full: add some missing darwin deps 2015-11-11 23:00:11 +01: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
Luca Bruno
e27c796b51 ffmpeg-full: fix src 2015-09-03 11:10:06 +02:00
Bjørn Forsman
6483cf1d91 ffmpeg-full: align pkgname with attrname
Without this, users are presented with this endless loop:

  $ ffplay
  The program ‘ffplay’ is currently not installed. You can install it by
  typing:
    nix-env -i ffmpeg
  $ nix-env -i ffmpeg
  $ ffplay
  The program ‘ffplay’ is currently not installed. You can install it by
  typing:
    nix-env -i ffmpeg
2015-09-02 12:14:40 +02:00
Andrew Kelley
9dd6f4f6ce ffmpeg: 2.7.1 -> 2.7.2 2015-08-28 22:08:43 -07:00
Jude Taylor
ef95107ddc make isClang work the way a user might expect 2015-08-12 11:27:54 -07:00
Andrew Kelley
1fdd432ffa ffmpeg: 2.6.3 -> 2.7.1 2015-07-08 17:03:49 -07:00
William A. Kennington III
7297255019 Convert all jack references to libjack2 2015-06-27 00:17:52 -07:00
William A. Kennington III
b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07: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
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