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

Revert "ffmpeg: Add option to enable x11grab support."

Browse Source 
This reverts commit 05831d3a668361b2948c0185eceb6d7c579c851a.
This commit is contained in:
Eelco Dolstra 2012-07-24 11:43:30 -04:00
parent 605f9bec52
commit bb8ac70291
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,6 @@
, vdpauSupport ? true, libvdpau ? null , vdpauSupport ? true, libvdpau ? null
, faacSupport ? false, faac ? null , faacSupport ? false, faac ? null
, dc1394Support ? false, libdc1394 ? null , dc1394Support ? false, libdc1394 ? null
, x11grabSupport ? false, libXext ? null, libXfixes ? null
}: }:
assert speexSupport -> speex != null; assert speexSupport -> speex != null;
@ -20,7 +19,6 @@ assert x264Support -> x264 != null;
assert xvidSupport -> xvidcore != null; assert xvidSupport -> xvidcore != null;
assert vdpauSupport -> libvdpau != null; assert vdpauSupport -> libvdpau != null;
assert faacSupport -> faac != null; assert faacSupport -> faac != null;
assert x11grabSupport -> libXext != null && libXfixes != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ffmpeg-0.11.1"; name = "ffmpeg-0.11.1";
@ -50,8 +48,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional xvidSupport "--enable-libxvid" ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
++ stdenv.lib.optional vdpauSupport "--enable-vdpau" ++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
++ stdenv.lib.optional dc1394Support "--enable-libdc1394" ++ stdenv.lib.optional dc1394Support "--enable-libdc1394";
++ stdenv.lib.optional x11grabSupport "--enable-x11grab";
buildInputs = [ pkgconfig lame yasm zlib bzip2 ] buildInputs = [ pkgconfig lame yasm zlib bzip2 ]
++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional mp3Support lame
@ -63,8 +60,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional xvidSupport xvidcore ++ stdenv.lib.optional xvidSupport xvidcore
++ stdenv.lib.optional vdpauSupport libvdpau ++ stdenv.lib.optional vdpauSupport libvdpau
++ stdenv.lib.optional faacSupport faac ++ stdenv.lib.optional faacSupport faac
++ stdenv.lib.optional dc1394Support libdc1394 ++ stdenv.lib.optional dc1394Support libdc1394;
++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ];
enableParallelBuilding = true; enableParallelBuilding = true;