Commit graph

81 commits

Author SHA1 Message Date
Niklas Hambüchen 9e78f76ade treewide: Remove unnecessary --disable-static (#66759)
* freetype: Remove unnecessary `--disable-static`.

The true-by-default `dontDisableStatic` already takes care of it.

Fixes freetype not being overridable to have static libs.

* treewide: Remove unnecessary `--disable-static`.

The true-by-default `dontDisableStatic` already takes care of it.

Fixes these packages not being overridable to have static libs.
2019-08-31 08:10:53 -04:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Michael Weiss 4469c2333c
ffmpeg-full: Disable libmfx and nvenc on AArch64 to fix the build
The AArch64 build was failing since 2019-03-26:
https://hydra.nixos.org/build/98821440
2019-08-23 14:30:46 +02:00
Michael Weiss 1537ce23b1
ffmpeg-full: 4.1.4 -> 4.2
Changelog: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/4.2:/Changelog

Configuration flag changes:
https://git.ffmpeg.org/gitweb/ffmpeg.git/blobdiff/n4.1.4..n4.2:/configure

Ignored new configuration flags:
--enable-libaribb24      enable ARIB text and caption decoding via libaribb24 [no]
--enable-pocketsphinx    enable PocketSphinx, needed for asr filter [no]
--enable-cuda-nvcc       enable Nvidia CUDA compiler [no]
--disable-cuda-llvm      disable CUDA compilation using clang [autodetect]
--disable-msa2           disable MSA2 optimizations

The renamed and removed configuration options where not used.

I've added a patch to prefer libdav1d over libaom, as libaom wasn't even
able to play my sample videos for AV1 (apart from the reduced
performance, at least in theory).
2019-08-21 18:02:30 +02:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Vladimír Čunát 3e17fe4522
ffmpeg{_4,-full}: 4.1.3 -> 4.1.4 (security)
Fixes #64656 CVE-2019-13312 CVE-2019-13390.
2019-07-30 15:31:24 +02:00
Vladimír Čunát 3686036e02
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1530372
2019-07-15 09:39:03 +02:00
Benjamin Esham 2d2a3dcffb
ffmpeg-full: Fix on Darwin (PR #63643) 2019-07-13 15:21:18 +02:00
Daiderd Jordan 6f16de27d2
ffmpeg-full: remove cf-private 2019-07-03 22:20:14 +02:00
Vladimír Čunát 5236232eea
ffmpeg-full: fix the build phase
I was surprised the build is so slow, and I see it's single-threaded
due to all work being done in install phase :-/
Please, do *not* rewrite phases unless you're really confident it's
a good approach; typically postFoo and preFoo is much better.

I considered filing this ffmpeg-related string of changes as a PR,
but in the end it doesn't seem likely to need review and we have too
many PRs as it is...
2019-05-11 11:38:28 +02:00
Vladimír Čunát 9fda8602e1
ffmpeg-full: enable nvenc by default
It's called "full", after all, and nvenc seem quite cheap actually.
Also remove an unused parameter.
2019-05-11 11:38:28 +02:00
Jorge Acereda f96ce31af8
nvenc: remove obsolete nvidia-video-sdk
(cherry picked from commit b869a42ddb02a3ad6eb812a52400e0603b578bbb)
2019-05-11 11:38:26 +02:00
Jorge Acereda de5e115de2
ffmpeg-full: nvenc doesn't imply nonfree licensing
(cherry picked from commit ce211e68396e7cfe0897586ae38b0e5fb268f09b)
2019-05-11 11:38:25 +02:00
Vladimír Čunát fd78c3b5de
ffmpeg-full: 4.1.2 -> 4.1.3 2019-05-11 11:21:20 +02:00
Matthew Bauer 810f2ba1f3
Merge pull request #57758 from midchildan/add-mediasdk
intel-media-sdk: init at 18.4.1
2019-03-25 22:18:23 -04:00
Will Dietz 2a5558ab30 ffmpeg-full: 4.1.1 -> 4.1.2 2019-03-24 14:20:18 -05:00
midchildan 410c30077c
ffmpeg-full: add libmfx support with intel-media-sdk 2019-03-17 16:18:38 +09:00
Mario Rodas 92917bfb99 ffmpeg-full: fix darwin build (#57342) 2019-03-12 01:23:12 +01:00
R. RyanTM fb16c10f47 ffmpeg-full: 4.1 -> 4.1.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ffmpeg-full/versions
2019-03-01 20:45:11 -08:00
Vladimír Čunát b277551a4b
Merge #52444: ffmpeg{_3_4,_4,-full}: updates 2019-01-19 16:56:21 +01:00
Anton-Latukha 9f6e6f9b31 nv-codec-headers: bring package to top-level 2019-01-05 03:31:43 +02:00
Will Dietz 471804736d ffmpeg-full: use cf-private to fix Darwin build 2018-12-31 11:00:03 -06:00
Will Dietz 8ac99ab1f4 ffmpeg-full: added missing libXext dep, needed for 'xlib' support 2018-12-28 13:06:20 -06:00
Will Dietz 2420e96990 ffmpeg{_4,-full}: 4.0.3 -> 4.1 2018-12-28 13:06:20 -06:00
Will Dietz 842e9184a9 ffmpeg-full: 4.0.2 -> 4.0.3 2018-12-28 13:06:20 -06:00
John Ericson 0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
Cray Elliott 737fdd7348 ffmpeg_4, ffmpeg-full: 4.0.1 -> 4.0.2 2018-08-01 21:20:14 -07:00
kiloreux 954489df24 ffmpeg-full: add AV1 encoder with libaom (#43789) 2018-08-01 17:03:44 +02:00
Silvan Mosberger e56b97fcf1
Merge pull request #43641 from jfrankenau/ffmpeg-libmysofa
libmysofa: init at 0.6 and enable in ffmpeg-full
2018-07-25 00:03:22 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Johannes Frankenau 91622a24aa libmysofa: init at 0.6 and enable in ffmpeg-full 2018-07-16 21:35:47 +02:00
Vladimír Čunát 03e13ab370
ffmpeg_4, ffmpeg-full: 4.0 -> 4.0.1 (security)
https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/e049f7c24f:/Changelog
http://ffmpeg.org/security.html claims it fixes CVE-2018-12458..12460
2018-07-15 11:07:03 +02:00
Tuomas Tynkkynen 6b6a575748 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/tools/networking/telnet/default.nix
	pkgs/top-level/aliases.nix
2018-05-16 03:09:33 +03:00
Cray Elliott dd7f08a1a6 ffmpeg-full: 3.4.2 -> 4.0
init local package nv-codec-headers, which are external nvidia headers,
now used when nvenc is enabled
2018-05-14 21:05:42 -07:00
John Ericson 7864a17bfb misc video players: Clean up cross 2018-05-10 01:57:49 -04:00
John Ericson feb648ce59 Merge commit '70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff' into lib-platform-simplify 2018-05-10 01:40:38 -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
Adam Copp 4d3cec0a57 ffmpeg-full: Enable vo-amrwbenc (#37432) 2018-04-17 10:41:47 -05: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
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 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