From de5e115de2d4fff8364097bef9a819b451b78958 Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Fri, 8 Feb 2019 10:50:43 +0000 Subject: [PATCH 1/3] ffmpeg-full: nvenc doesn't imply nonfree licensing (cherry picked from commit ce211e68396e7cfe0897586ae38b0e5fb268f09b) --- pkgs/development/libraries/ffmpeg-full/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 84d106638a2d..59c74be0538c 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -228,7 +228,7 @@ assert libxcbxfixesExtlib -> libxcb != null; assert libxcbshapeExtlib -> libxcb != null; assert openglExtlib -> libGLU_combined != null; assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; -assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; +assert nvenc -> nvidia-video-sdk != null; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; From f96ce31af828e16df1a569c345f39951d1aa5091 Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Thu, 9 May 2019 19:36:40 +0200 Subject: [PATCH 2/3] nvenc: remove obsolete nvidia-video-sdk (cherry picked from commit b869a42ddb02a3ad6eb812a52400e0603b578bbb) --- pkgs/development/libraries/ffmpeg-full/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 59c74be0538c..ca0a250e3d4b 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -97,7 +97,7 @@ , libXv ? null # Xlib support , libXext ? null # Xlib support , 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 , openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code @@ -228,7 +228,6 @@ assert libxcbxfixesExtlib -> libxcb != null; assert libxcbshapeExtlib -> libxcb != null; assert openglExtlib -> libGLU_combined != null; assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; -assert nvenc -> nvidia-video-sdk != null; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; @@ -418,7 +417,7 @@ stdenv.mkDerivation rec { ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optionals isLinux [ alsaLib libraw1394 libv4l ] ++ 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 MediaToolbox VideoDecodeAcceleration libiconv cf-private /* For _OBJC_EHTYPE_$_NSException */ ]; From 9efdc7530a21c3a155d27f61e1d2a953f3a90203 Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Fri, 10 May 2019 13:05:26 +0200 Subject: [PATCH 3/3] nv-codec-headers: fix license (cherry picked from commit 65c52e11ab066b0e16250ef4c8d8354f3529a5ce) --- pkgs/development/libraries/nv-codec-headers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/nv-codec-headers/default.nix b/pkgs/development/libraries/nv-codec-headers/default.nix index 07ec502cd12a..73ed932afb63 100644 --- a/pkgs/development/libraries/nv-codec-headers/default.nix +++ b/pkgs/development/libraries/nv-codec-headers/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "FFmpeg version of headers for NVENC"; homepage = http://ffmpeg.org/; - license = stdenv.lib.licenses.gpl3Plus; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.MP2E ]; platforms = stdenv.lib.platforms.all; };