alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

ffmpeg-full: 3.2.4 -> 3.3

Browse source 
remove legacy x11grab and memalign configure option, both removed
as of 3.3
This commit is contained in:
Cray Elliott 2017-04-18 17:11:14 -07:00
parent a7455d7f5c
commit 5a9850cedd
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/libraries/ffmpeg-full/default.nix
View file

@ -14,7 +14,6 @@
, swscaleAlphaBuild ? true # Alpha channel support in swscale
, hardcodedTablesBuild ? true # Hardcode decode tables instead of runtime generation
, safeBitstreamReaderBuild ? true # Buffer boundary checking in bitreaders
, memalignHackBuild ? false # Emulate memalign
, multithreadBuild ? true # Multithreading via pthreads/win32 threads
, networkBuild ? true # Network support
, pixelutilsBuild ? true # Pixel utils in libavutil
@ -120,7 +119,6 @@
#, vo-aacenc ? null # AAC encoder
#, vo-amrwbenc ? null # AMR-WB encoder
, wavpack ? null # Wavpack encoder
, x11grabExtlib ? false, libXext ? null, libXfixes ? null # X11 grabbing (legacy)
, x264 ? null # H.264/AVC encoder
, x265 ? null # H.265/HEVC encoder
, xavs ? null # AVS encoder
@ -227,16 +225,15 @@ assert libxcbxfixesExtlib -> libxcb != null;
assert libxcbshapeExtlib -> libxcb != null;
assert openglExtlib -> mesa != null;
assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
assert x11grabExtlib -> libX11 != null && libXv != null;
assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
stdenv.mkDerivation rec {
name = "ffmpeg-full-${version}";
version = "3.2.4";
version = "3.3";
src = fetchurl {
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
sha256 = "0ymg1mkg1n0770gmjfqp79p5ijxq04smfrsrrxc8pjc0y0agyf3f";
sha256 = "17anx7rnbi63if1ndr61836lf76dpn47n0y424hc48bj05y7z7jr";
};
patchPhase = ''patchShebangs .
@ -264,7 +261,6 @@ stdenv.mkDerivation rec {
(enableFeature swscaleAlphaBuild "swscale-alpha")
(enableFeature hardcodedTablesBuild "hardcoded-tables")
(enableFeature safeBitstreamReaderBuild "safe-bitstream-reader")
(enableFeature memalignHackBuild "memalign-hack")
(if multithreadBuild then (
if isCygwin then
"--disable-pthreads --enable-w32threads"
@ -377,7 +373,6 @@ stdenv.mkDerivation rec {
#(enableFeature (vo-aacenc != null && version3Licensing) "libvo-aacenc")
#(enableFeature (vo-amrwbenc != null && version3Licensing) "libvo-amrwbenc")
(enableFeature (wavpack != null) "libwavpack")
(enableFeature (x11grabExtlib && gplLicensing) "x11grab")
(enableFeature (x264 != null && gplLicensing) "libx264")
(enableFeature (x265 != null && gplLicensing) "libx265")
(enableFeature (xavs != null && gplLicensing) "libxavs")
@ -400,10 +395,9 @@ stdenv.mkDerivation rec {
bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug
libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11
libxcb libXext libXfixes libXv lzma openal openjpeg_1 libpulseaudio rtmpdump
libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump
samba SDL2 soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib
] ++ optional openglExtlib mesa
++ optionals x11grabExtlib [ libXext libXfixes ]
++ optionals nonfreeLicensing [ fdk_aac openssl ]
++ optional ((isLinux || isFreeBSD) && libva != null) libva
++ optionals isLinux [ alsaLib libraw1394 libv4l ]