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

Merge pull request #120482 from ronthecookie/ffmpeg-vulkan 

ffmpeg-full: add vulkan and glslang features
This commit is contained in:
Michael Weiss 2021-05-03 14:49:49 +02:00 committed by GitHub
parent a4c3a2d732 909ab9b660
commit 296100245d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,6 +132,8 @@
, xvidcore ? null # Xvid encoder, native encoder exists , xvidcore ? null # Xvid encoder, native encoder exists
, zeromq4 ? null # Message passing , zeromq4 ? null # Message passing
, zlib ? null , zlib ? null
, vulkan-loader ? null
, glslang ? null
#, zvbi ? null # Teletext support #, zvbi ? null # Teletext support
/* /*
* Developer options * Developer options
@ -401,6 +403,8 @@ stdenv.mkDerivation rec {
(enableFeature (xvidcore != null && gplLicensing) "libxvid") (enableFeature (xvidcore != null && gplLicensing) "libxvid")
(enableFeature (zeromq4 != null) "libzmq") (enableFeature (zeromq4 != null) "libzmq")
(enableFeature (zlib != null) "zlib") (enableFeature (zlib != null) "zlib")
(enableFeature (isLinux && vulkan-loader != null) "vulkan")
(enableFeature (glslang != null) "libglslang")
#(enableFeature (zvbi != null && gplLicensing) "libzvbi") #(enableFeature (zvbi != null && gplLicensing) "libzvbi")
/* /*
* Developer flags * Developer flags
@ -422,12 +426,12 @@ stdenv.mkDerivation rec {
libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11
libxcb libXv libXext xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr libxcb libXv libXext xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr
samba SDL2 soxr speex srt vid-stab vo-amrwbenc x264 x265 xavs xvidcore samba SDL2 soxr speex srt vid-stab vo-amrwbenc x264 x265 xavs xvidcore
zeromq4 zlib zeromq4 zlib glslang
] ++ optionals openglExtlib [ libGL libGLU ] ] ++ optionals openglExtlib [ libGL libGLU ]
++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optionals nonfreeLicensing [ fdk_aac openssl ]
++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optional ((isLinux || isFreeBSD) && libva != null) libva
++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf ++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf
++ optionals isLinux [ alsaLib libraw1394 libv4l ] ++ optionals isLinux [ alsaLib libraw1394 libv4l vulkan-loader ]
++ optional (isLinux && !isAarch64 && libmfx != null) libmfx ++ optional (isLinux && !isAarch64 && libmfx != null) libmfx
++ optional nvenc nv-codec-headers ++ optional nvenc nv-codec-headers
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation