ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

ffmpeg: make fdk-aac support configurable

Browse Source
This commit is contained in:
Thomas Tuegel 2014-01-02 15:57:28 -06:00
parent e548166c44
commit 90c99bab59
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/ffmpeg/2.x.nix
View File

@ -14,6 +14,7 @@
, x11grabSupport ? false, libXext ? null, libXfixes ? null , x11grabSupport ? false, libXext ? null, libXfixes ? null
, playSupport ? true, SDL ? null , playSupport ? true, SDL ? null
, freetypeSupport ? true, freetype ? null, fontconfig ? null , freetypeSupport ? true, freetype ? null, fontconfig ? null
, fdkAACSupport ? false, fdk_aac ? null
}: }:
assert speexSupport -> speex != null; assert speexSupport -> speex != null;
@ -29,6 +30,7 @@ assert faacSupport -> faac != null;
assert x11grabSupport -> libXext != null && libXfixes != null; assert x11grabSupport -> libXext != null && libXfixes != null;
assert playSupport -> SDL != null; assert playSupport -> SDL != null;
assert freetypeSupport -> freetype != null; assert freetypeSupport -> freetype != null;
assert fdkAACSupport -> fdk_aac != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ffmpeg-2.1.1"; name = "ffmpeg-2.1.1";
@ -62,7 +64,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional dc1394Support "--enable-libdc1394" ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
++ stdenv.lib.optional x11grabSupport "--enable-x11grab" ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"
++ stdenv.lib.optional playSupport "--enable-ffplay" ++ stdenv.lib.optional playSupport "--enable-ffplay"
++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig"; ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig"
++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree";
buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ] buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ]
++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional mp3Support lame
@ -79,7 +82,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional dc1394Support libdc1394 ++ stdenv.lib.optional dc1394Support libdc1394
++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ] ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]
++ stdenv.lib.optional playSupport SDL ++ stdenv.lib.optional playSupport SDL
++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ]; ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ]
++ stdenv.lib.optional fdkAACSupport fdk_aac;
enableParallelBuilding = true; enableParallelBuilding = true;
@ -100,5 +104,6 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://www.ffmpeg.org/; homepage = http://www.ffmpeg.org/;
description = "A complete, cross-platform solution to record, convert and stream audio and video"; description = "A complete, cross-platform solution to record, convert and stream audio and video";
license = if (fdkAACSupport || faacSupport) then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus;
}; };
} }

10
pkgs/development/libraries/ffmpeg/configurable.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, config, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl { stdenv, fetchurl, config, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl
, lame, speex, libtheora, libvorbis, libvpx, x264, xvidcore, libopus , lame, speex, libtheora, libvorbis, libvpx, x264, xvidcore, libopus
, libvdpau, libva, faac, libdc1394, libXext, libXfixes, SDL , libvdpau, libva, faac, libdc1394, libXext, libXfixes, SDL
, freetype, fontconfig , freetype, fontconfig, fdk_aac
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
vdpauSupport = config.ffmpeg.vdpau or true; vdpauSupport = config.ffmpeg.vdpau or true;
vaapiSupport = config.ffmpeg.vaapi or true; vaapiSupport = config.ffmpeg.vaapi or true;
faacSupport = config.ffmpeg.faac or false; faacSupport = config.ffmpeg.faac or false;
fdkAACSupport = config.ffmpeg.fdk or false;
dc1394Support = config.ffmpeg.dc1394 or false; dc1394Support = config.ffmpeg.dc1394 or false;
x11grabSupport = config.ffmpeg.x11grab or false; x11grabSupport = config.ffmpeg.x11grab or false;
playSupport = config.ffmpeg.play or true; playSupport = config.ffmpeg.play or true;
@ -52,7 +53,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional dc1394Support "--enable-libdc1394" ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
++ stdenv.lib.optional x11grabSupport "--enable-x11grab" ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"
++ stdenv.lib.optional playSupport "--enable-ffplay" ++ stdenv.lib.optional playSupport "--enable-ffplay"
++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig"; ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig"
++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree";
buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ] buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ]
++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional mp3Support lame
@ -69,7 +71,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional dc1394Support libdc1394 ++ stdenv.lib.optional dc1394Support libdc1394
++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ] ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]
++ stdenv.lib.optional playSupport SDL ++ stdenv.lib.optional playSupport SDL
++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ]; ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ]
++ stdenv.lib.optional fdkAACSupport fdk_aac;
enableParallelBuilding = true; enableParallelBuilding = true;
@ -90,5 +93,6 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://www.ffmpeg.org/; homepage = http://www.ffmpeg.org/;
description = "A complete, cross-platform solution to record, convert and stream audio and video"; description = "A complete, cross-platform solution to record, convert and stream audio and video";
license = if (fdkAACSupport || faacSupport) then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus;
}; };
} }