From 5b6b1100f303190604f919d1a0dfde21e1e3856a Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Thu, 6 Apr 2017 20:12:20 -0700 Subject: [PATCH] ffmpeg-full: replace SDL support with SDL2 support ffmpeg 3.2 dropped support for SDL1 completely, so migrate to SDL2 --- pkgs/development/libraries/ffmpeg-full/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 47fcd76240b2..9a5c228ac82f 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -110,7 +110,7 @@ #, libquvi ? null # Quvi input support , samba ? null # Samba protocol #, schroedinger ? null # Dirac de/encoder -, SDL ? null +, SDL2 ? null #, shine ? null # Fixed-point MP3 encoder , soxr ? null # Resampling via soxr , speex ? null # Speex de/encoder @@ -199,7 +199,7 @@ assert ffplayProgram -> avcodecLibrary && avformatLibrary && swscaleLibrary && swresampleLibrary - && SDL != null; + && SDL2 != null; assert ffprobeProgram -> avcodecLibrary && avformatLibrary; assert ffserverProgram -> avformatLibrary; /* @@ -368,7 +368,7 @@ stdenv.mkDerivation rec { #(enableFeature (schroedinger != null) "libschroedinger") #(enableFeature (shine != null) "libshine") (enableFeature (samba != null && gplLicensing && version3Licensing) "libsmbclient") - (enableFeature (SDL != null) "sdl") # Only configurable since 2.5, auto detected before then + (enableFeature (SDL2 != null) "sdl2") (enableFeature (soxr != null) "libsoxr") (enableFeature (speex != null) "libspeex") #(enableFeature (twolame != null) "libtwolame") @@ -401,7 +401,7 @@ stdenv.mkDerivation rec { 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 - samba SDL soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib + 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 ]