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

ffmpeg-full: replace SDL support with SDL2 support

Browse Source 
ffmpeg 3.2 dropped support for SDL1 completely, so migrate to SDL2
This commit is contained in:
Cray Elliott 2017-04-06 20:12:20 -07:00
parent 6f0a2af5bc
commit 5b6b1100f3
1 changed files with 4 additions and 4 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

@ -110,7 +110,7 @@
#, libquvi ? null # Quvi input support #, libquvi ? null # Quvi input support
, samba ? null # Samba protocol , samba ? null # Samba protocol
#, schroedinger ? null # Dirac de/encoder #, schroedinger ? null # Dirac de/encoder
, SDL ? null , SDL2 ? null
#, shine ? null # Fixed-point MP3 encoder #, shine ? null # Fixed-point MP3 encoder
, soxr ? null # Resampling via soxr , soxr ? null # Resampling via soxr
, speex ? null # Speex de/encoder , speex ? null # Speex de/encoder
@ -199,7 +199,7 @@ assert ffplayProgram -> avcodecLibrary
&& avformatLibrary && avformatLibrary
&& swscaleLibrary && swscaleLibrary
&& swresampleLibrary && swresampleLibrary
&& SDL != null; && SDL2 != null;
assert ffprobeProgram -> avcodecLibrary && avformatLibrary; assert ffprobeProgram -> avcodecLibrary && avformatLibrary;
assert ffserverProgram -> avformatLibrary; assert ffserverProgram -> avformatLibrary;
/* /*
@ -368,7 +368,7 @@ stdenv.mkDerivation rec {
#(enableFeature (schroedinger != null) "libschroedinger") #(enableFeature (schroedinger != null) "libschroedinger")
#(enableFeature (shine != null) "libshine") #(enableFeature (shine != null) "libshine")
(enableFeature (samba != null && gplLicensing && version3Licensing) "libsmbclient") (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 (soxr != null) "libsoxr")
(enableFeature (speex != null) "libspeex") (enableFeature (speex != null) "libspeex")
#(enableFeature (twolame != null) "libtwolame") #(enableFeature (twolame != null) "libtwolame")
@ -401,7 +401,7 @@ stdenv.mkDerivation rec {
libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug
libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11
libxcb libXext libXfixes libXv lzma openal openjpeg_1 libpulseaudio rtmpdump 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 ] ++ optional openglExtlib mesa
++ optionals x11grabExtlib [ libXext libXfixes ] ++ optionals x11grabExtlib [ libXext libXfixes ]
++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optionals nonfreeLicensing [ fdk_aac openssl ]