Commit graph

190 commits

Author SHA1 Message Date
Vladimír Čunát 06b602b192
ffmpeg_2: 2.8.13 -> 2.8.14
Lots of bugfixes:
https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/3f8a0d5ad1:/Changelog
2018-06-17 12:13:38 +02:00
John Ericson f40aa17933 Merge remote-tracking branch 'upstream/master' into staging 2018-05-10 13:29:04 -04:00
xeji 1463480edb
Merge pull request #40289 from yegortimoshenko/mpv-bump
mpv: 0.27.2 -> 0.28.2
2018-05-10 18:21:38 +02:00
Yegor Timoshenko 956d174c8d
ffmpeg_4: init 2018-05-10 17:44:40 +03:00
John Ericson 7d8e16d939
Merge pull request #40275 from obsidiansystems/fewer-crossAttrs
fontconfig, misc A/V packages: No crossAttrs
2018-05-10 02:17:34 -04:00
John Ericson 7864a17bfb misc video players: Clean up cross 2018-05-10 01:57:49 -04:00
John Ericson 006422d08d Merge commit 'feb648ce59ffbed94c58133eb7aa2761992a35e1' into staging 2018-05-10 01:55:26 -04:00
John Ericson a02be2bd85 treewide: Get rid of *Platform.arch
Use `parsed.cpu.name` or `platform.gcc.arch` instead.
2018-05-10 01:37:31 -04:00
Matthew Justin Bauer eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
John Ericson b9acfb4ecf treewide: isArm -> isAarch32
Following legacy packing conventions, `isArm` was defined just for
32-bit ARM instruction set. This is confusing to non packagers though,
because Aarch64 is an ARM instruction set.

The official ARM overview for ARMv8[1] is surprisingly not confusing,
given the overall state of affairs for ARM naming conventions, and
offers us a solution. It divides the nomenclature into three levels:

```
ISA:             ARMv8   {-A, -R, -M}
                 /    \
Mode:     Aarch32     Aarch64
             |         /   \
Encoding:   A64      A32   T32
```

At the top is the overall v8 instruction set archicture. Second are the
two modes, defined by bitwidth but differing in other semantics too, and
buttom are the encodings, (hopefully?) isomorphic if they encode the
same mode.

The 32 bit encodings are mostly backwards compatible with previous
non-Thumb and Thumb encodings, and if so we can pun the mode names to
instead mean "sets of compatable or isomorphic encodings", and then
voilà we have nice names for 32-bit and 64-bit arm instruction sets
which do not use the word ARM so as to not confused either laymen or
experienced ARM packages.

[1]: https://developer.arm.com/products/architecture/a-profile

(cherry picked from commit ba52ae5048)
2018-04-25 15:50:41 -04:00
John Ericson ba52ae5048 treewide: isArm -> isAarch32
Following legacy packing conventions, `isArm` was defined just for
32-bit ARM instruction set. This is confusing to non packagers though,
because Aarch64 is an ARM instruction set.

The official ARM overview for ARMv8[1] is surprisingly not confusing,
given the overall state of affairs for ARM naming conventions, and
offers us a solution. It divides the nomenclature into three levels:

```
ISA:             ARMv8   {-A, -R, -M}
                 /    \
Mode:     Aarch32     Aarch64
             |         /   \
Encoding:   A64      A32   T32
```

At the top is the overall v8 instruction set archicture. Second are the
two modes, defined by bitwidth but differing in other semantics too, and
buttom are the encodings, (hopefully?) isomorphic if they encode the
same mode.

The 32 bit encodings are mostly backwards compatible with previous
non-Thumb and Thumb encodings, and if so we can pun the mode names to
instead mean "sets of compatable or isomorphic encodings", and then
voilà we have nice names for 32-bit and 64-bit arm instruction sets
which do not use the word ARM so as to not confused either laymen or
experienced ARM packages.

[1]: https://developer.arm.com/products/architecture/a-profile
2018-04-25 15:28:55 -04:00
Jan Malakhovski 7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Alexander V. Nikolaev 0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Cray Elliott c8aebb699a ffmpeg, ffmpeg-full: 3.4.1 -> 3.4.2 2018-02-18 09:04:16 -08:00
Will Dietz 22e0a3c1b8 ffmpeg: fix cross compile eval 2018-01-05 18:35:19 -06:00
Cray Elliott c1e8fea4fc ffmpeg, ffmpeg-full: 3.4 -> 3.4.1
also remove CVE patch, it is upstream in v3.4.1
2017-12-17 23:00:05 -08:00
Vladimír Čunát 8b53b2ec2c
Merge branch 'master' into staging 2017-11-28 21:06:44 +01:00
Andreas Rammhold 2492f45565
ffmpeg-3.4: apply fix CVE CVE-2017-16840
Details at [1].

[1] http://git.videolan.org/?p=ffmpeg.git;a=commit;h=a94cb36ab2ad99d3a1331c9f91831ef593d94f74
2017-11-28 00:14:05 +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
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