public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge ffmpeg-full: nvenc doesn't imply nonfree licensing

Browse Source 
It's a port of #55442 to master.
This commit is contained in:
Vladimír Čunát 2019-05-11 11:29:38 +02:00
commit b1565e5af8
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -97,7 +97,7 @@
, libXv ? null # Xlib support , libXv ? null # Xlib support
, libXext ? null # Xlib support , libXext ? null # Xlib support
, lzma ? null # xz-utils , lzma ? null # xz-utils
, nvenc ? false, nvidia-video-sdk ? null, nv-codec-headers ? null # NVIDIA NVENC support , nvenc ? false, nv-codec-headers ? null # NVIDIA NVENC support
, callPackage # needed for NVENC to access external ffmpeg nvidia headers , callPackage # needed for NVENC to access external ffmpeg nvidia headers
, openal ? null # OpenAL 1.1 capture support , openal ? null # OpenAL 1.1 capture support
#, opencl ? null # OpenCL code #, opencl ? null # OpenCL code
@ -228,7 +228,6 @@ assert libxcbxfixesExtlib -> libxcb != null;
assert libxcbshapeExtlib -> libxcb != null; assert libxcbshapeExtlib -> libxcb != null;
assert openglExtlib -> libGLU_combined != null; assert openglExtlib -> libGLU_combined != null;
assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ffmpeg-full-${version}"; name = "ffmpeg-full-${version}";
@ -418,7 +417,7 @@ stdenv.mkDerivation rec {
++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optional ((isLinux || isFreeBSD) && libva != null) libva
++ optionals isLinux [ alsaLib libraw1394 libv4l ] ++ optionals isLinux [ alsaLib libraw1394 libv4l ]
++ optional (isLinux && libmfx != null) libmfx ++ optional (isLinux && libmfx != null) libmfx
++ optionals nvenc [ nvidia-video-sdk nv-codec-headers ] ++ optional nvenc nv-codec-headers
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
MediaToolbox VideoDecodeAcceleration MediaToolbox VideoDecodeAcceleration
libiconv cf-private /* For _OBJC_EHTYPE_$_NSException */ ]; libiconv cf-private /* For _OBJC_EHTYPE_$_NSException */ ];

2
pkgs/development/libraries/nv-codec-headers/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "FFmpeg version of headers for NVENC"; description = "FFmpeg version of headers for NVENC";
homepage = http://ffmpeg.org/; homepage = http://ffmpeg.org/;
license = stdenv.lib.licenses.gpl3Plus; license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.MP2E ]; maintainers = [ stdenv.lib.maintainers.MP2E ];
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };