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
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
Franz Pletz
85cffcfce0
ffmpeg_2_8: 2.8.11 -> 2.8.13
2017-09-05 14:24:59 +02:00
Tuomas Tynkkynen
9f2f74d9bc
ffmpeg: Add man output
2017-08-11 21:32:53 +03:00
Cray Elliott
2f9724e804
ffmpeg, ffmpeg-full: 3.3.2 -> 3.3.3
2017-08-07 12:53:48 -07: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
dc12cd1cae
ffmpeg: fix sha256 hash for 3.3.1
...
ffmpeg-full uses the .xz source release while ffmpeg uses .bz2 so hashes
cannot be shared between them
2017-05-23 20:46:10 -07: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
Nikolay Amiantov
6679dbbd60
ffmpeg: fix arm build
2017-05-19 02:29:49 +03:00
Daiderd Jordan
0ffe146ed3
ffmpeg: remove darwin patch
2017-05-01 13:31:00 +02:00
Cray Elliott
fe3590b5ba
remove ffmpeg_3_2 and ffmpeg_3_1
2017-04-30 16:52:48 -07:00
Cray Elliott
dfd371de9b
ffmpeg: use SDL2 instead of SDL for 3.2 and above
...
addresses issue #24658
special thanks to codyopel who suggested this solution!
2017-04-30 16:52:48 -07:00
Cray Elliott
7172556e8d
ffmpeg: 3.2.4 -> 3.3
2017-04-30 16:52:48 -07:00
Franz Pletz
e8af5dcd8e
ffmpeg: 3.2.2 -> 3.2.4 for multiple CVEs
...
Fixes CVE-2017-5024 & CVE-2017-5025.
See https://ffmpeg.org/security.html .
2017-02-15 09:35:28 +01:00
Franz Pletz
d2426f0aa8
ffmpeg: 3.1.6 -> 3.1.7 for multiple CVEs
...
Fixes CVE-2017-5024 & CVE-2017-5025.
See https://ffmpeg.org/security.html .
2017-02-15 09:35:27 +01:00
Franz Pletz
78f59f1223
ffmpeg: 2.8.10 -> 2.8.11 for multiple CVEs
...
Fixes CVE-2017-5024 & CVE-2017-5025.
See https://ffmpeg.org/security.html .
2017-02-15 09:35:27 +01:00
Graham Christensen
16f8f0d313
ffmpeg_3: 3.1.4 -> 3.1.6
2017-02-02 08:47:01 -05:00
Vladimír Čunát
6edc9788f5
ffmpeg_2_8: maintenance 2.8.8 -> 2.8.10
2017-01-26 14:13:30 +01:00
Stefan Götz
9280174493
mpv: 0.22.0 -> 0.23.0
2017-01-10 22:42:29 +01:00
Tomas Hlavaty
20f138c3d7
ffmpeg: respect sdlSupport option
2016-12-13 22:37:06 +01:00
Graham Christensen
2f7bdfe97e
ffmpeg: 3.1.3 -> 3.1.4
2016-10-19 08:48:11 -04:00
Graham Christensen
561741a9d4
ffmpeg: 2.8.7 -> 2.8.8
2016-09-23 20:22:01 -04:00
Vladimír Čunát
853e230fca
ffmpeg_2: 2.8.6 -> 2.8.7
2016-09-10 11:33:18 +02:00
Dmitry Kalinkin
e7afac83c9
ffmpeg3: fix darwin build ( #18350 )
2016-09-06 10:58:34 +02:00
Tuomas Tynkkynen
8c4aeb1780
Merge staging into master
...
Brings in:
- changed output order for multiple outputs:
https://github.com/NixOS/nixpkgs/pull/14766
- audit disabled by default
https://github.com/NixOS/nixpkgs/pull/17916
Conflicts:
pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
Zero King
e35bbf108a
ffmpeg: 3.1.2 -> 3.1.3
2016-08-30 09:06:18 +00:00
Tuomas Tynkkynen
a17216af4c
treewide: Shuffle outputs
...
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Zero King
f7823dde4f
ffmpeg: 3.1.1 -> 3.1.2
2016-08-26 09:05:43 +00:00
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
William A. Kennington III
8ad2a13bdf
ffmpeg: 1.2.8 -> 1.2.9
2014-10-17 14:26:44 -07:00
Mateusz Kowalczyk
23fbed1fef
ffmpeg: update from 2.4.1 to 2.4.2
2014-10-06 17:36:40 +01:00
Mateusz Kowalczyk
76f07fbafc
ffmpeg-1: meta.branch
2014-09-30 11:13:43 +01:00
Mateusz Kowalczyk
0f485bd0db
ffmpeg_0_10: update from 0.10.14 to 0.10.15
...
cc @lovek323
2014-09-30 11:13:37 +01:00
Mateusz Kowalczyk
07e2be6c29
ffmpeg-0.6: branch info
2014-09-30 10:33:15 +01:00
Mateusz Kowalczyk
aafca4dd51
Add a few meta.branch to please monitor
2014-09-30 10:07:49 +01:00
Nathaniel Baxter
859918d235
vlc: Add ffmpeg version 2.3.x for vlc.
...
Vlc doesn't support libavcodec >= 56 yet, which means it needs an older
version of ffmpeg.
Closes #4286
2014-09-27 01:04:38 +01:00
Mateusz Kowalczyk
d6821cc9a8
ffmpeg: update from 2.3.3 to 2.4.1
2014-09-26 06:29:07 +01:00
Moritz Ulrich
332395b262
Add myself as a maintainer to a bunch of packages.
2014-09-04 17:05:21 +02:00
Moritz Ulrich
439ebda62a
ffmpeg_1: update from 1.2.7 to 1.2.8
2014-09-04 17:05:20 +02:00
Mateusz Kowalczyk
98cc03eb22
ffmpeg: update to 2.3.3
2014-08-29 13:05:09 +01:00
Vladimír Čunát
3310c8b507
ffmpeg: maintenance update
2014-08-14 22:28:46 +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
6b4929373f
ffmpeg: major update 2.2.4 -> 2.3
...
It's claimed to be fully API-compatible update.
2014-07-20 08:44:58 +02:00
Vladimír Čunát
07a09fbe63
ffmpeg{_2,_1,_0_10}: minor update
2014-06-30 21:00:36 +02:00
Jason "Don" O'Conal
bcc36ee23e
mpd: fix build on darwin
2014-05-21 15:50:15 +10:00
Chris Double
30c3b81cc2
Update ffmpeg to 2.2.2
2014-05-08 00:52:38 +12:00
Sterling Stein
63b3cf669b
Add subtitle option for ffmpeg.
2014-04-25 20:13:12 -07:00
Thomas Tuegel
922e4f3858
ffmpeg 2.1.4 -> 2.2.1
2014-04-16 07:49:51 -05:00