BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #24698 from MP2E/ffmpeg_sdl2

Browse source 
ffmpeg-full: replace SDL support with SDL2 support
This commit is contained in:
Aristid Breitkreuz 2017-04-08 12:16:11 +02:00 committed by GitHub
commit 43626b6a88
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 ]